Merge branch 'wookiem-snowflakefix1'

Author: bartonhammond

package.json

@@ -43,10 +43,10 @@
     "apsl-react-native-button": "git+https://git@github.com/bartonhammond/react-native-button.git",
     "immutable": "3.7.6",
     "key-mirror": "1.0.1",
-    "react-native": "0.22.2",
+    "react-native": "0.24.0",
     "react-native-gifted-spinner": "0.0.3",
     "react-native-navbar": "1.4.0",
-    "react-native-router-flux": "3.1.5",
+    "react-native-router-flux": "3.22.0",
     "react-native-simple-store": "0.1.0",
     "react-native-simpledialog-android": "1.0.3",
     "react-native-vector-icons": "1.3.2",

src/reducers/auth/authActions.js

@@ -245,14 +245,14 @@ export function getSessionToken() {
           Actions.Tabbar();
         } else {
           dispatch(sessionTokenRequestFailure());
-          Actions.Register();
+          Actions.InitialLoginForm();
         }
       })
 
       .catch((error) => {
         dispatch(sessionTokenRequestFailure(error));
         dispatch(loginState());
-        Actions.Register();
+        Actions.InitialLoginForm();
       });
   };
 }

src/snowflake.js

@@ -160,15 +160,17 @@ export default function native(platform) {
                      title="App"
                      initial={true}/>
 
-	      <Scene key="Login"
+	      <Scene key="InitialLoginForm"
+                     component={Register}
+                     title="Register" />
+                     
+        <Scene key="Login"
                      component={Login}
-                     title="Login"
-                     type="replace"/>
+                     title="Login"/>
 
 	      <Scene key="Register"
                      component={Register}
-                     title="Register"
-                     type="replace"/>
+                     title="Register"/>
 
 	      <Scene key="ForgotPassword"
                      component={ForgotPassword}
@@ -213,4 +215,4 @@ export default function native(platform) {
    */
 
   AppRegistry.registerComponent('snowflake', () => Snowflake);
-}
+}