Merge branch 'develop'
Add a StaticPages controller
Finish static pages