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
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
update home screen textsize and icon issue
fixed home screen icon issue
fix issue #1 and #2
fix splash screen logo size
fix topic screen issue and added icon for topic list row
Emergency Contact Screen On Going process
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
fix slide text size topic slide
fix icon for topic activity
Improve and fix issues on RegistrationActivity screen
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
added string for topic one
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
Add Settings screen. Load previous preferences in it. Rename a few bad files.