finished templates...again
Merge branch 'dev'
"Merging in templates"