Add a StaticPages controller
Merge branch 'master' into admin
Finish static pages