Merge branch 'upgrade'

.npmignore

@@ -1,11 +1,6 @@
 example
 old-example-redux
 
-test/
-res/generated/
-
-.npmignore
-
 #################
 # from .gitignore:
 ################

example/package.json

@@ -8,8 +8,8 @@
     "android": "cd android && ./gradlew installDebug"
   },
   "dependencies": {
-    "react-native": "0.31.0",
-    "react": "15.2.1",
+    "react-native": "0.37.0",
+    "react": "15.3.2",
     "react-native-navigation": "file:../"
   }
 }

package.json

@@ -30,14 +30,14 @@
     "react": "*"
   },
   "dependencies": {
-    "lodash": "^4.13.0"
+    "lodash": "^4.16.0"
   },
   "optionalDependencies": {
     "react-redux": "*"
   },
   "devDependencies": {
-    "react-native": "0.31.0",
-    "react": "15.2.1",
+    "react-native": "0.37.0",
+    "react": "15.3.2",
     "app-root-path": "^1.0.0",
     "babel-cli": "^6.8.0",
     "babel-core": "^6.8.0",

src/deprecated/platformSpecificDeprecated.android.js

@@ -59,7 +59,7 @@ function navigatorPush(navigator, params) {
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);
   adapted.overrideBackPress = params.overrideBackPress;
-  
+
   newPlatformSpecific.push(adapted);
 }
 
@@ -351,7 +351,7 @@ function addNavigatorParams(screen, navigator = null, idx = '') {
 
 function addNavigatorButtons(screen, sideMenuParams) {
   const Screen = Navigation.getRegisteredScreen(screen.screen);
-  Object.assign(screen, Screen.navigatorButtons);
+  screen.navigatorButtons = _.cloneDeep(Screen.navigatorButtons);
 
   // Get image uri from image id
   const rightButtons = getRightButtons(screen);

src/deprecated/platformSpecificDeprecated.ios.js

@@ -185,9 +185,9 @@ function _mergeScreenSpecificSettings(screenID, screenInstanceID, params) {
   }
 
   let navigatorEventID = screenInstanceID + '_events';
-  let navigatorButtons = JSON.parse(JSON.stringify(screenClass.navigatorButtons));
+  let navigatorButtons = _.cloneDeep(screenClass.navigatorButtons);
   if (params.navigatorButtons) {
-    navigatorButtons = JSON.parse(JSON.stringify(params.navigatorButtons));
+    navigatorButtons = _.cloneDeep(params.navigatorButtons);
   }
   if (navigatorButtons.leftButtons) {
     for (let i = 0; i < navigatorButtons.leftButtons.length; i++) {
@@ -230,7 +230,7 @@ function navigatorPush(navigator, params) {
 
   Controllers.NavigationControllerIOS(navigator.navigatorID).push({
     title: params.title,
-    subtitle:params.subtitle,
+    subtitle: params.subtitle,
     titleImage: params.titleImage,
     component: params.screen,
     animated: params.animated,