From 108f54d01953f06db2e1cad635569c9f7d299c59 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sun, 8 Nov 2015 22:28:05 -0800
Subject: [PATCH] Fix nav brand issue bump react router

---
 common/app/components/Nav/Nav.jsx | 3 ++-
 package.json                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/app/components/Nav/Nav.jsx b/common/app/components/Nav/Nav.jsx
index a199d0a539..874d791e91 100644
--- a/common/app/components/Nav/Nav.jsx
+++ b/common/app/components/Nav/Nav.jsx
@@ -4,6 +4,7 @@ import {
   Col,
   CollapsibleNav,
   Nav,
+  NavBrand,
   Navbar,
   NavItem
 } from 'react-bootstrap';
@@ -106,11 +107,11 @@ export default React.createClass({
     const { username, points, picture } = this.props;
     return (
       <Navbar
-        brand={ logoElement }
         className='nav-height'
         fixedTop={ true }
         toggleButton={ toggleButton }
         toggleNavKey={ 0 }>
+        <NavBrand>{ logoElement }</NavBrand>
         <CollapsibleNav eventKey={ 0 }>
           <Nav
             className='hamburger-dropdown'
diff --git a/package.json b/package.json
index 6210cddd6d..6a6345b6ad 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "react": "^0.14.2",
     "react-bootstrap": "~0.27.3",
     "react-motion": "~0.3.1",
-    "react-router": "https://github.com/BerkeleyTrue/react-router.git#freecodecamp",
+    "react-router": "^1.0.0-rc4",
     "react-router-bootstrap": "^0.19.2",
     "react-vimeo": "^0.0.3",
     "request": "~2.65.0",