Merge branch 'master' into develop
fix routes for pages controller, whoops.
Merge branch 'develop'