Merge branch 'master' of ssh://10.10.100.21/source/UU_RN_M

# Conflicts:
#	package-lock.json

App.js

@@ -1,3 +1,12 @@
+
+/**
+ * Sample React Native App
+ * https://github.com/facebook/react-native
+ *
+ * @format
+ * @flow
+ */
+
 import React, {Component} from 'react';
 import {Platform, StyleSheet, Text, View} from 'react-native';
 
@@ -8,9 +17,8 @@ const instructions = Platform.select({
     'Shake or press menu button for dev menu',
 });
 
-type Props = {};
 
-export default class App extends Component<Props> {
+export default class App extends Component{
     render() {
         return (
             <View style={styles.container}>

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "HybridAndroid",
+  "name": "HybridApp",
   "version": "0.0.1",
   "private": true,
   "scripts": {