Merge branch 'hotfix/workgoup§translation'
Updated Email Template
Merge branch 'hotfix/email-teamplate-fix' into develop