Merge branch 'master' into gh-pages
moved routes inside controller
Merge branch 'gh-pages'