CreditCard moved to ws.travel.data
Merge branch 'master' of https://github.com/ogzd/webservices-project

Conflicts:
	TravelGoodREST/src/java/ws/travel/services/FlightService.java
	TravelGoodREST/src/java/ws/travel/services/HotelService.java