arreglo actividad
Merge branch 'master' of https://github.com/jose1988/src

Conflicts:
	conf/xml-resources/web-service-references/GestionDeUsuarios/wsdl/localhost_15362/CapaDeServicios/GestionDeUsuarios.xsd_1.xsd

	conf/xml-resources/web-service-references/GestionDeUsuarios/wsdl/localhost_15362/CapaDeServicios/GestionDeUsuarios.xsd_1.xsd.REMOTE.3204.xsd