Merge branch 'hotfix/updates'
Update home page template
Merge branch 'hotfix/template-updates' into develop