idk
Merge branch 'master' of https://github.com/srklonaris/HealthAtHome

Conflicts:
	android/src/com/healthathome/activities/SendInquiryActivity.java