fixes
SMTP
Merge branch 'jersey' of https://github.com/utwente-di/di05 into jersey