setup
Merge branch 'master' into 613-multiclient-push-notifications-TK

Conflicts:
	services/NotificationService/.classpath
Merge branch 'master' of https://github.com/tckeelin/RideShare into develop