Fix publicTransportMode when different transport types passing through the same way. Fix tram stop name.
Merge branch 'master' of https://github.com/osmandapp/OsmAnd-resources