Updated Templates
Merge branch 'dev'