Set up map view to Set selected location
Merge branch 'master' into Local

Conflicts:
	Recommend.xcodeproj/project.pbxproj