Merge branch 'bug' into pre

# Conflicts:
#	src/components/video/index.js

src/App.js

@@ -82,8 +82,8 @@ class App extends Component {
         location.state = {
             ...state, ...{
                 record: _state.record ?
-                    [..._state.record, {pathname: location.pathname}] :
-                    [{pathname: location.pathname}]
+                    [..._state.record, {pathname: location.pathname, search: location.search, hash: location.hash}] :
+                    [{pathname: location.pathname, search: '', hash: ''}]
             }
         }
     }