add javamail
Merge origin/master
fix some IT