Override sendMail
Merge branch 'master' into hibernate4