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

Conflicts:
	build/generated-sources/jax-ws/wsdl/CustomerService.java
	build/generated/jax-wsCache/CustomerService/wsdl/CustomerService.java
	build/web/WEB-INF/classes/services/ApiService.class
	build/web/WEB-INF/classes/services/RestClient.class
	build/web/WEB-INF/classes/services/SoapClient.class
	build/web/WEB-INF/classes/view/Controller.class
	build/web/WEB-INF/classes/view/OrderLineJSF.class
	build/web/WEB-INF/classes/view/ProductJSF.class
	build/web/WEB-INF/classes/view/Settings.class
	build/web/WEB-INF/classes/view/converter/ProductConverter.class
	build/web/WEB-INF/classes/wsdl/CustomerService.class
	build/web/WEB-INF/wsdl/localhost_8080/soap/CustomerService.wsdl
	build/web/WEB-INF/wsdl/localhost_8080/soap/CustomerService.xsd_1.xsd
	build/web/listProducts.xhtml
	build/web/principal.xhtml
	build/web/top.xhtml
	nbproject/private/private.xml
	src/conf/xml-resources/web-service-references/CustomerService/wsdl/localhost_8080/soap/CustomerService.wsdl
	src/java/services/SoapClient.java
	src/java/view/converter/ProductConverter.java
	web/WEB-INF/wsdl/localhost_8080/soap/CustomerService.wsdl