edit templates
Merge branch 'dev'