finish new_home_template_page
tmp
Merge branch 'feature/new_home_template_page' into develop
tmp
Merge branch 'develop'