Added push notifications
Finished merge