spinner item
Merge remote-tracking branch 'ClinicLoc/master'

Conflicts:
	app/src/main/res/layout/activity_maps.xml
spinner item
Merge remote-tracking branch 'ClinicLoc/master'