CreditCard updated
cancelItinerary
Merge branch 'master' of https://github.com/ogzd/webservices-project

Conflicts:
	TravelGoodREST/src/java/ws/travel/ItineraryResource.java