Add a StaticPages controller
Merge branches 'static-pages' and 'master'