Add a StaticPages controller
Finish static pages
Update readme for merge test.
Merge branch 'master' into static-pages