Add a StaticPages controller
Finish static pages
Finish static pages
Fix last merge