added static pages controller
Merge branch 'master' into static_pages
Finished static pages