Merge pull request #271 from mhotan/phase_4_dev

Unsubscribe Push service is now commented out
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev