Merge branch 'release/commenthandling'
set utf8 charset for template
Merge branch 'hotfix/template/utf8' into develop