waypoints have a display order and a lat/lon pair
Merge remote-tracking branch 'origin/master'