Setup Android counter..
Merge branch 'master' of https://github.com/healthteam/teamhealth

Conflicts:
	app/src/main/AndroidManifest.xml