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

Conflicts:
	index.xhtml

	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.wsdl
	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.xsd_1.xsd
	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeControlDeUsuarios.wsdl
	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeControlDeUsuarios.xsd_1.xsd
	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/Mensajeria.wsdl
	deleted:    WEB-INF/wsdl/localhost_15362/CapaDeServicios/Mensajeria.xsd_1.xsd
	modified:   index.xhtml