Add new page link
Merge branch 'add-page' into dev
Merge branch 'dev'