adds pages controller for non-app pages
removes static index.html
Merge branch 'master' into cancan

This pulls in the static home page from the master branch