Route drawing and saving works from trip->new
Merge remote-tracking branch 'origin/master'