merge with master
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
fix icon height and width
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/java/bd/gov/dghs/maoshishu/helper/TopicFactoryShishu.java
add shishur khaddo fragment
up navigation fixed for DetailActivity.java
landscape layout for mayer shastho nirdeshika
Add fragment_shishur_shastho_topic_five.xml, fragment_shishur_shastho_topic_six.xml. Fix actionBar title typeface in DetailActivity.java
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/DetailActivity.java
Add titles for child disease in arrays.xml