Merge branch 'master' into task-18-fix_custom_subject_and_from_sender_contact
[#18] Fix custom email subject bug
Merge branch 'task-18-fix_custom_subject_and_from_sender_contact' into develop
Merge branch 'develop'