mergefix
Merge branch 'mapview'

Conflicts:
	weather.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
add Today