Finish static pages 2013
Merge branch 'static-pages'