method in TravelClient.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	fhdw-travelservice-ws/src/main/java/de/urlaubr/ws/client/TravelClient.java
method in TravelClient.java