add hotel in REST
Merge branch 'master' of https://github.com/ogzd/webservices-project

Conflicts:
	TravelGoodREST/src/java/ws/travel/data/Itinerary.java
Merge branch 'master' of https://github.com/ogzd/webservices-project