Notifications working
Manifest changes
Merge branch 'gerard'