create StaticPages controller
Merge branch 'master' into static-pages
Finish static pages
Finish static pages