update template

update template
Merge branch 'dev'