Service
Merge branch 'master' of https://github.com/zchennn/glifitApp.git

Conflicts:
	Glifit/src/com/example/GlifItProto/Notification.java