Finish Static Pages
Merge branch 'static-pages'