Merge branch 'feature/template-rewrite' of github.com:Indholdskanalen/indholdskanalen into feature/template-rewrite