Search by price and by date added
Changed methods for addReservation and addFlight, they now return the object that was just added along with their new generated IDs
Merge pull request #38 from tommyschnabel/Tommy

Implemented login and register on the server
Redone searches with searchParams
Merge pull request #40 from tommyschnabel/Tommy

Tried fixing user service test, and gave up. Added validation to registe...
Changed methods for addReservation and addFlight, they now return the object that was just added along with their new generated IDs
Just a couple of tweaks, changed Reservation a little
Finished service
Deleted search.java
Changed addObject methods to return the newly added object. Updated test cases.
Merge branch 'Kenny' of https://github.com/tommyschnabel/SoftwareSystemsEngineeringProject into Kenny

Conflicts:
	src/main/java/edu/spsu/swe3613/reservations/SQLiteReservationsDao.java
Merge pull request #41 from tommyschnabel/Kenny

Changed methods for addReservation and addFlight, they now return the object that was just added
Search by price and by date added
Redone searches with searchParams
Finished service
Deleted search.java
Fixed broken code
Merge branch 'Alex' of https://github.com/tommyschnabel/Reservations into Alex

Conflicts:
	WebReserve.db
	src/main/java/edu/spsu/swe3613/reservations/DefaultReservationsService.java
	src/main/java/edu/spsu/swe3613/reservations/Flight.java
	src/main/java/edu/spsu/swe3613/reservations/ReservationsService.java
	src/main/java/edu/spsu/swe3613/reservations/ReservationsWeb.java
Merge pull request #39 from tommyschnabel/Alex

Alex
Working on implementing Jackson
Fixed some merged conflicts
Added admin module