Add.StaticPages controller
Merge branch 'static-pages' into develop