Integrated notifications
Conflicts resolved, merging with master
Merge pull request #334 from ptsavdar/master

Integrated Notification System