Update templates
Merge branch 'develop'