Merge branch 'master' of https://github.com/sakthie/HumanCare

Conflicts:
	HumanCare.suo