fix bug in getTransportByTwoStations, add findByStationOnLineId to
Stops, add query to entity.Stops
Merge remote-tracking branch 'origin/develop' into develop