Add progress timer
Merge branch 'master' of https://github.com/healthteam/teamhealth

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