Merge branch 'Waypoints'

Conflicts:
	CycleStreets-Info.plist
	CycleStreets.xcodeproj/project.pbxproj
	CycleStreets.xcodeproj/project.xcworkspace/xcuserdata/neil.xcuserdatad/UserInterfaceState.xcuserstate
	CycleStreets.xcodeproj/xcuserdata/neil.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	resources/xib/controllers/itinerary/RouteSegmentView.xib
	resources/xib/controllers/map/MapView.xib
	src/controllers/Itinerary/RouteSegmentViewController.m
	src/controllers/Map/MapViewController.m
	src/controllers/Routes/RouteListViewController.m
Revert "Merge branch 'Waypoints'"

This reverts commit bcdfc1bacd059fdc4e5395b1ac2f8d5732abce07, reversing
changes made to 5ead310d15fe91b4ce9f23e8cf2877e4724235df.
Merge branch 'master' into newmaster
Merge branch 'releasecandidate/v2.5-RC'
Merge branch 'releasecandidate/v2.5-b222-RC'
User reported bugs

+ CL reported crashes
+ Added auto upload for newly signed in users in PhotoWizard
2.5.1 release