Edit
Merge branch 'relese_code' into develop
Added new templates