Ticket #1273: Fixing token replacement in notification e-mails
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop