Add templates
Merge branch 'Templates'