probando
commit
Merge branch 'master' of https://github.com/jose1988/web

Conflicts:
	WEB-INF/jax-ws-catalog.xml
	index.xhtml