about icon added
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
About Page design fixed
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/SettingsActivity.java