commit
no se que es
xx
xx
xx
buscar politica
commit
pendiente
cambios en general
comiit
Merge branch 'master' of https://github.com/jose1988/srcC

Conflicts:
	java/com/pangea/capadeservicios/beans/actividadFacade.java

	renamed:    conf/xml-resources/web-service-references/AplicarPolitica/wsdl/localhost_8080/com.pangea.gestordepoliticas/AplicarPolitica.wsdl -> conf/xml-resources/web-service-references/AplicarPolitica/wsdl/localhost_15362/Gestordepoliticas/AplicarPolitica.wsdl
	new file:   conf/xml-resources/web-service-references/AplicarPolitica/wsdl/localhost_15362/Gestordepoliticas/AplicarPolitica.xsd_1.xsd
	deleted:    conf/xml-resources/web-service-references/AplicarPolitica/wsdl/localhost_8080/com.pangea.gestordepoliticas/AplicarPolitica.xsd_1.xsd
	modified:   java/com/pangea/capadeservicios/beans/AbstractFacade.java
	modified:   java/com/pangea/capadeservicios/beans/actividadFacade.java
	modified:   java/com/pangea/capadeservicios/beans/clasificacion_rolFacade.java
	modified:   java/com/pangea/capadeservicios/beans/clasificacion_usuarioFacade.java
	modified:   java/com/pangea/capadeservicios/beans/grupoFacade.java
	modified:   java/com/pangea/capadeservicios/beans/organizacionFacade.java
	modified:   java/com/pangea/capadeservicios/beans/politicaFacade.java
	modified:   java/com/pangea/capadeservicios/beans/reporteFacade.java
	modified:   java/com/pangea/capadeservicios/beans/rolFacade.java
	modified:   java/com/pangea/capadeservicios/beans/skinFacade.java
	modified:   java/com/pangea/capadeservicios/beans/usuarioFacade.java
	modified:   java/com/pangea/capadeservicios/entidades/actividad.java
	modified:   java/com/pangea/capadeservicios/entidades/cola_de_tarea.java
	modified:   java/com/pangea/capadeservicios/entidades/tarea.java
	modified:   java/com/pangea/capadeservicios/envoltorios/WR_resultado.java
	modified:   java/com/pangea/capadeservicios/servicios/ConsultasOperacionales.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeActividades.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeClasificacion_rol.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeClasificacion_usuario.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeGrupo.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeInstancias.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeOrganizacion.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeRol.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDeUsuarios.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionDepolitica.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionarInterfaz.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionarReporte.java
	modified:   java/com/pangea/capadeservicios/servicios/GestionarSkin.java
	modified:   java/com/pangea/capadeservicios/servicios/Mensajeria.java
	modified:   java/com/pangea/capadeservicios/validadores/ConsultasOperacionalesValidador.java
	modified:   java/com/pangea/capadeservicios/validadores/GestionDeActividadesValidador.java
	modified:   java/com/pangea/capadeservicios/validadores/GestionDeInstanciasValidador.java
	modified:   java/com/pangea/capadeservicios/validadores/GestionarInterfaceValidador.java
no tengo la culpa de lo q pueda pasar
actividad facade detallito
politicas
politicas
buscar estados
cambio cierre sesión
estados
buscar usuario
lista de actividades