...
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/HospitalListActivity.java
User Model Updated