add mailserver
Merge branch 'master' into addTerminalDiff
Finalise mailserver functionality
Fixing bug on mail delivery