Merge branch 'hotfix/1.7.1'
Added newsletter templates
Merge branch 'hotfix/1.7.2' into develop