added static pages
Merge branch 'staging'