update files
Merge branch 'template_develop_v2'