Fix.finish static pages
Merge branch 'add-page' into develop
Merge branch 'develop'