Update default routing, theme update
Merge branch 'master' of github.com:ongoworks/reaction-core