stash
merging
draft
Merge remote-tracking branch 'nicky/dev' into dev
added polylines for multiple journeys
Merge branch 'current_master' into dev
added multiple colors to polylines
Merge pull request #19 from hoongman/current_master

added multiple journey polylines