NotificationService updated
Merge branch 'master' of https://github.com/Oblify/Server

Conflicts:
	oblify-app/Oblify/src/com/groups/services/NotificationService.java