route drawn with shapes, not with stop locations
Merge remote-tracking branch 'origin/master' into new_master