Add a StaticPages controller
Finish static pages
Merge remote-tracking branch 'origin/master'