commit
Merge branch 'master' of https://github.com/ogzd/webservices-project

Conflicts:
	TravelGoodTest/test/ws/travel/rest/test/TravelGoodRESTTest.java