Print lap count in summary
Add option to not use laps in tcx files
Merge branch 'master' into rider20plus