Global changed where created SMTPSERVER
begin refactoring email
Merge remote-tracking branch 'kuhnen/master'