Merge branch 'development' into qa
added some logging to email
added some logging to email
fixed email I think
Merge branch 'qa' into development