[Resolved Conflict] Merge next into saga branch

src/store/configureStore.dev.ts

@@ -5,12 +5,11 @@ import { routerMiddleware } from 'react-router-redux'
 import createHistory from 'history/createBrowserHistory'
 import { createLogger } from 'redux-logger'
 import { rootReducer } from 'reducers'
-
+import DevTools from './devTools'
 // Create a history of your choosing (we're using a browser history in this case)
 export const history = createHistory()
 
 // - Build the middleware for intercepting and dispatching navigation actions
-const middleware = routerMiddleware(history)
 const logger = createLogger()
 
 // - initial state
@@ -20,8 +19,8 @@ let initialState = {
 
 // - Config and create store of redux
 let store: redux.Store<any> = redux.createStore(rootReducer, initialState, redux.compose(
-  redux.applyMiddleware(logger,thunk,middleware),
-  (window as any).devToolsExtension ? (window as any).devToolsExtension() : (f: any) => f
+  redux.applyMiddleware(logger,thunk, routerMiddleware(history)),
+  DevTools.instrument()
 ))
 
 export default {store, history}

src/store/configureStore.ts

@@ -2,7 +2,7 @@ import configureStoreDev from './configureStore.dev'
 import configureStoreProd from './configureStore.prod'
 
 const store = process.env.NODE_ENV === 'production'
-? configureStoreDev
-: configureStoreProd
+? configureStoreProd
+: configureStoreDev
 
 export default store

src/store/devTools.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import { createDevTools } from 'redux-devtools'
+import LogMonitor from 'redux-devtools-log-monitor'
+import DockMonitor from 'redux-devtools-dock-monitor'
+
+export default createDevTools(
+  <DockMonitor toggleVisibilityKey='ctrl-h'
+               changePositionKey='ctrl-w'>
+    <LogMonitor />
+  </DockMonitor>
+)