1. Data Pulled form Server for hospital
2. User Updated with the IMEI no
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/AndroidManifest.xml
Fix misplaced code.