speed fixes
pulling conflict out.
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	Strava Centurion/IO/TcxDataSegmentReader.cs
Add the speed fix back in.