add template
Merge branch 'add_template' into dev