Merge pull request #216 from leider/master

kleinkram für mailsending
Merge pull request #217 from leider/master

minor changes with frontendtests
Merge remote-tracking branch 'upstream/master'