added external configuration functionality for java mail
Merge remote-tracking branch 'origin/master'