Added a StaticPages controller again
Finish static pages
Merge branch 'static-pages'