Fix merge errors
Work on registration screen backend
Complete registration screen backend tasks
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu

Conflicts:
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/bd/gov/dghs/maoshishu/SplashActivity.java
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles_registration_activity.xml
merge with master