init templates
Merge branch 'feature/templates'