fix merge conflict
Merge branch 'development'
HOTFIX: updated host for prodction emails