email xml, email sender complete
Merge remote-tracking branch 'origin/master'