Done with static pages, finally
Merge branch 'static-pages'