resposta REST e SOAP
no message
ApiInterface
merge
merge2
Merge branch 'master' of https://github.com/silviaoliveira/TecnoCliente

Conflicts:
	build/web/WEB-INF/classes/services/SoapClient.class
	build/web/WEB-INF/classes/view/Controller.class
	build/web/WEB-INF/classes/view/Settings.class
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	src/java/view/Settings.java