added more integration tests for OrderService and new tests for TripService
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/realdolmen/rdtravel/repository/FlightRepository.java