Mail Class Added Changed a Lot in the Registrationprocess, with Student etc.
Merge origin/master