master page
master page update
Merge branch 'feature/master_page' into develop