no message
no message
Merge branch 'master' of https://github.com/silviaoliveira/TecnoCliente

Conflicts:
	build/generated-sources/jax-ws/services/CustomerService.java
	build/generated-sources/jax-ws/services/FindCustomerOrderResponse.java
	build/generated-sources/jax-ws/services/FindProduct.java
	build/generated-sources/jax-ws/services/FindProductNextSupplyDate.java
	build/generated-sources/jax-ws/services/FindProductNextSupplyDateResponse.java
	build/generated-sources/jax-ws/services/FindProductResponse.java
	build/generated-sources/jax-ws/wsdl/CreateCustomerOrder.java
	build/generated-sources/jax-ws/wsdl/CustomerOrder.java
	build/generated-sources/jax-ws/wsdl/FindCustomerOrderResponse.java
	build/generated-sources/jax-ws/wsdl/FindNextSupplyDate.java
	build/generated-sources/jax-ws/wsdl/FindNextSupplyDateResponse.java
	build/generated-sources/jax-ws/wsdl/FindProduct.java
	build/generated-sources/jax-ws/wsdl/FindProductById.java
	build/generated-sources/jax-ws/wsdl/FindProductByIdResponse.java
	build/generated-sources/jax-ws/wsdl/FindProductNextSupplyDate.java
	build/generated-sources/jax-ws/wsdl/FindProductNextSupplyDateResponse.java
	build/generated-sources/jax-ws/wsdl/FindProductResponse.java
	build/generated-sources/jax-ws/wsdl/OrderLine.java
	build/generated/jax-wsCache/CustomerService/services/CustomerService.java
	build/generated/jax-wsCache/CustomerService/services/FindCustomerOrderResponse.java
	build/generated/jax-wsCache/CustomerService/services/FindProduct.java
	build/generated/jax-wsCache/CustomerService/services/FindProductNextSupplyDate.java
	build/generated/jax-wsCache/CustomerService/services/FindProductNextSupplyDateResponse.java
	build/generated/jax-wsCache/CustomerService/services/FindProductResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/CreateCustomerOrder.java
	build/generated/jax-wsCache/CustomerService/wsdl/CustomerOrder.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindCustomerOrderResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindNextSupplyDateResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProduct.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProductById.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProductByIdResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProductNextSupplyDate.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProductNextSupplyDateResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/FindProductResponse.java
	build/generated/jax-wsCache/CustomerService/wsdl/OrderLine.java
	build/web/WEB-INF/classes/services/ApiInterface.class
	build/web/WEB-INF/classes/services/ApiService.class
	build/web/WEB-INF/classes/services/FindAllCustomerOrders.class
	build/web/WEB-INF/classes/services/RestClient.class
	build/web/WEB-INF/classes/services/SoapClient.class
	build/web/WEB-INF/classes/view/converter/ProductAttributeConverter.class
	build/web/WEB-INF/classes/view/converter/ProductCategoryConverter.class
	build/web/WEB-INF/classes/view/converter/ProductConverter.class
	build/web/WEB-INF/classes/view/converter/ProductDesignationConverter.class
	build/web/WEB-INF/classes/wsdl/CreateCustomerOrder.class
	build/web/WEB-INF/classes/wsdl/CustomerOrder.class
	build/web/WEB-INF/classes/wsdl/CustomerService.class
	build/web/WEB-INF/classes/wsdl/EditCustomerOrder.class
	build/web/WEB-INF/classes/wsdl/FindAllCustomerOrdersResponse.class
	build/web/WEB-INF/classes/wsdl/FindCustomerOrder.class
	build/web/WEB-INF/classes/wsdl/FindCustomerOrderResponse.class
	build/web/WEB-INF/classes/wsdl/FindDeliveryDate.class
	build/web/WEB-INF/classes/wsdl/FindDeliveryDateResponse.class
	build/web/WEB-INF/classes/wsdl/FindProductByDesignationResponse.class
	build/web/WEB-INF/classes/wsdl/FindProductStockResponse.class
	build/web/WEB-INF/classes/wsdl/ObjectFactory.class
	build/web/WEB-INF/classes/wsdl/OrderLine.class
	build/web/WEB-INF/classes/wsdl/Product.class
	build/web/WEB-INF/classes/wsdl/ProductAttribute.class
	build/web/WEB-INF/classes/wsdl/ProductCategory.class
	build/web/WEB-INF/classes/wsdl/RemoveCustomerOrder.class
	build/web/WEB-INF/classes/wsdl/SearchProductsResponse.class
	build/web/WEB-INF/jax-ws-catalog.xml
	build/web/WEB-INF/wsdl/localhost_8080/soap/CustomerService.wsdl
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/conf/xml-resources/web-service-references/CustomerService/wsdl/localhost_8080/soap/CustomerService.wsdl
	src/conf/xml-resources/web-service-references/CustomerService/wsdl/localhost_8080/soap/CustomerService.xsd_1.xsd
	src/java/services/ApiInterface.java
	src/java/services/RestClient.java
	src/java/view/converter/ProductAttributeConverter.java
	src/java/view/converter/ProductCategoryConverter.java
	src/java/view/converter/ProductConverter.java
	src/java/view/converter/ProductDesignationConverter.java
	web/WEB-INF/jax-ws-catalog.xml
	web/WEB-INF/wsdl/localhost_8080/soap/CustomerService.wsdl