Partial work.
Merge branch 'master' of https://github.com/healthteam/teamhealth

Conflicts:
	app/src/main/java/org/senguptas/teamhealth/activities/InviteUserActivity.java
	app/src/main/java/org/senguptas/teamhealth/fragments/UserSelectorFragment.java
Fixed notification.
Cleaned up user flow.
Merge branch 'master' of https://github.com/healthteam/teamhealth

Conflicts:
	app/src/main/java/org/senguptas/teamhealth/activities/InviteUserActivity.java