Added htmlBody to the email plugging to send messages in HTML format
Merge branch 'htmlemail' into dev