Merge pull request #600 from jirmauritz/notification

Notifications: logging of sent emails and fixed bug in removing regex from template
All changes from 'master' to 'production'