add method findByRouteId, add transportTravel.jsp, add Controller, add
method getTransportByTwoStations to TransportManager, change
OrderStationMain, change lines.jsp
add method findByRouteId, add transportTravel.jsp, add Controller, add
method getTransportByTwoStations to TransportManager, change
OrderStationMain, change lines.jsp
Merge remote-tracking branch 'origin/develop' into develop
change styles, add layout
111
Delete some warnings
Add method getStationsOnCertainLine
Merge branch 'develop' of https://github.com/tranzero/SoftServe_Java-105_Project into develop
create addLines.jsp, removeLines.jsp, updateLines.jsp, and edit
LinesManagerImpl.java.
add stationsoncertainline view
Merge remote-tracking branch 'origin/develop' into develop
fix bug in getTransportByTwoStations, add findByStationOnLineId to
Stops, add query to entity.Stops
Merge remote-tracking branch 'origin/develop' into develop
fix for 24 time format
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/com/ita/edu/softserve/manager/StationsManager.java
	src/main/java/com/ita/edu/softserve/manager/impl/StationsManagerImpl.java
	src/main/java/com/ita/edu/softserve/web/StationsController.java