Versión Final - Web Service SOAP
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.xml
	web/WEB-INF/jax-ws-catalog.xml