de la merde
Merge branch 'master' of https://github.com/giacogiac/bug-marmelade.git

Conflicts:
	mistergooddeal/src/main/java/proxies/ext/fedps_adrien/Fedps.java
	mistergooddeal/src/main/java/proxies/ext/fedps_adrien/FedpsService.java
	mistergooddeal/src/main/java/proxies/ext/fedps_adrien/FedpsService_FedpsServicePort_Client.java
	mistergooddeal/src/main/java/proxies/ext/fedps_adrien/UnknownIdFile_Exception.java
	mistergooddeal/src/main/java/transport/giac/fedps/DeliveryService.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/Dimensions.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/EstimationRequest.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/EstimationResponse.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/OrderRequest.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/OrderResponse.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/Quote.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/TrackRequest.java
	mistergooddeal/src/main/java/transport/giac/fedps/messages/TrackResponse.java