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
fix slide text size topic slide
fix icon for topic activity
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