Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Don't use queue to send
Tweak the email layout
Update the email views
Merge branch 'master' into develop