Commented out line that unsubscribes push service
Comment out unsubscribe Push Service
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev

Conflicts:
	DineOnUserApplication/res/values/strings.xml
Merge branch 'master' of https://github.com/mhotan/DineOn into phase_4_dev
Merge pull request #271 from mhotan/phase_4_dev

Unsubscribe Push service is now commented out