modified templates
modified templates
finished templates
Merge branch 'dev'
Merging templates into master