e-mail notification
Merge branch 'tobi' into development