Merge branch 'master' into addLocalLogin-#269

client/homebrew/homebrew.jsx

@@ -32,13 +32,16 @@ const Homebrew = createClass({
 			}
 		};
 	},
+
 	getInitialState : function() {
 		global.account = this.props.account;
 		global.version = this.props.version;
 		global.enable_v3 = this.props.enable_v3;
 		global.config = this.props.config;
-		return {};
+
+    return {};
 	},
+
 	render : function (){
 		return (
 			<Router location={this.props.url}>

client/homebrew/navbar/navbar.jsx

@@ -14,12 +14,10 @@ const Navbar = createClass({
 		};
 	},
 
-	componentDidMount : function() {
-		//const isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-		this.setState({
-			//showNonChromeWarning : !isChrome,
-			ver : window.version
-		});
+	getInitialState : function() {
+		return {
+			ver : global.version
+		};
 	},
 
 	/*