Adds local notifications
Merge branch 'master' into vicente