instanciaUsuarioController
	modified:   conf/xml-resources/web-service-references/GestionDeActividades/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.wsdl
	modified:   conf/xml-resources/web-service-references/GestionDeGrupo/wsdl/localhost_15362/CapaDeServicios/GestionDeGrupo.wsdl
	modified:   conf/xml-resources/web-service-references/GestionDeInstancias/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.wsdl
	modified:   conf/xml-resources/web-service-references/GestionDeUsuarios/wsdl/localhost_15362/CapaDeServicios/GestionDeUsuarios.wsdl
Merge branch 'master' of https://github.com/jose1988/src

Conflicts:
	conf/xml-resources/web-service-references/GestionDeActividades/wsdl/localhost_15362/CapaDeServicios/GestionDeActividades.wsdl
	conf/xml-resources/web-service-references/GestionDeInstancias/wsdl/localhost_15362/CapaDeServicios/GestionDeInstancias.wsdl

	modified:   java/com/pangea/PangeaFlowProyecto/control/actividadController.java