Merge branch 'develop' into travis/granular-settings

src/components/structures/login/Login.js

@@ -370,6 +370,9 @@ module.exports = React.createClass({
         }
         */
 
+        let serverConfig;
+        let header;
+
         if (!SdkConfig.get().disable_custom_urls) {
             serverConfig = <ServerConfig ref="serverConfig"
                 withToggleButton={true}
@@ -381,9 +384,6 @@ module.exports = React.createClass({
                 delayTimeMs={1000} />;
         }
 
-        let serverConfig;
-        let header;
-
         // FIXME: remove status.im theme tweaks
         const theme = SettingsStore.getValue("theme");
         if (theme !== "status") {