wed
Merge branch 'comments' into dev

Conflicts:
	RideAlong/RideMapViewController.m