added edit notification and grouping of emails
Merge branch 'notifications'