Merge branch 'hotfix/fix_email'
Change "Doomcon" for "Swancon"
Merge branch 'hotfix/fix_content_email_template' into develop