Merge branch 'release/template' into develop
actualize and clean
Merge branch 'release/1.0'