Better template partials implementation
Change templates to use the new partial implementation
Merge branch 'feature/issue-551-better-client-side-template-partials' into develop-frontend