instanciausuario
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.xsd_1.xsd
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeControlDeUsuarios.wsdl
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeControlDeUsuarios.xsd_1.xsd
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeGrupo.wsdl
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeGrupo.xsd_1.xsd
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.wsdl
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.xsd_1.xsd
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeUsuarios.wsdl
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeUsuarios.xsd_1.xsd
	new file:   WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.xsd_1.xsd
Merge branch 'master' of https://github.com/jose1988/web

Conflicts:
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.wsdl
	WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.xsd_1.xsd

	modified:   WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.wsdl
	modified:   WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.xsd_1.xsd
	new file:   WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.wsdl
	new file:   WEB-INF/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.xsd_1.xsd