Changed something I don't remember what, some minor changes.
Added mathod saveOrUpdate().
Added jsp to add transport into database.
Added saveOrUpdateTransport method.
Changed some property to transport field.
Merge remote-tracking branch 'origin/develop' into develop
change styles
Added four columns to (seatclass1,seatclass2,seatclass3, Price).
Made changes to corresponding classes.
Merge remote-tracking branch 'origin/develop' into develop
fix merge
Merge remote-tracking branch 'origin/develop' into develop
create addStationToLine.jsp add edit LinesController.java
Merge remote-tracking branch 'origin/develop' into develop
delete styles declarations from jsps
Merge remote-tracking branch 'origin/develop' into develop
fix time calculations
changes to transport table
Merge remote-tracking branch 'origin/develop' into develop
bug with transport table fixed
Add userEDIT 2 and modifications in entity user