Fix spelling lap
User model updated
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/res/values/strings.xml
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Done adding child disease data to strings.xml
Change fragment file names to identify ma and shishu topics separately
User Update and Add option changed.
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Add fragment_shishur_shastho_topic_one.xml
Merge branch 'master' of https://github.com/Apptitive/Ma-o-Shishu
Save user in Settings Activity. Add one shishu shastho topic layout/fragment_shishur_shastho_topic_two.xml