Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_add_user.xml
#	app/src/main/res/layout/activity_edit__hosp.xml
#	app/src/main/res/layout/activity_help.xml
#	app/src/main/res/layout/activity_location.xml
#	app/src/main/res/layout/activity_login1.xml
#	app/src/main/res/layout/activity_remove__hosp.xml
#	app/src/main/res/layout/activity_user1.xml
#	app/src/main/res/layout/activity_view__hosp.xml