Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
[51] Set email content-type to text/html
Merge branch 'task-51-change_email_type_to_html' into develop