t
Merge branch 'master' of https://github.com/GravityInnovations/mha

Conflicts:
	trunk/MyHealthAssistant/src/com/gravity/innovations/mha/MainActivity.java