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

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/HomeActivity.java
Fix merge error done by sharif
Fix spelling mistake done by sharif
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Emergency Contact Screen On Going process
Improve and fix issues on RegistrationActivity screen
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/HomeActivity.java
Rename bad file name list_activityt.xml
Improve and fix issues on RegistrationActivity screen
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
	app/src/main/java/bd/gov/dghs/maoshishu/SplashActivity.java
	app/src/main/res/layout/topics_item.xml
	app/src/main/res/values/colors.xml
	app/src/main/res/values/strings.xml
fix merge errors