Flights and hotels uhuu
Merge remote-tracking branch 'origin/master'

Conflicts:
	travel_buddy/src/main/java/travelbuddy/webservice/TravelResource.java