Change launcher icon
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Work on Home Screen bottom
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/src/main/java/bd/gov/dghs/maoshishu/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml