Merge branch 'static_pages' after finish static pages