Started working on notifications
Merge remote-tracking branch 'origin/master'
Implemented basic push notifications