work in progress
Merge branch 'master' into react-route
changed to react-router and fluxible-app setup