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

Conflicts:
	index.xhtml

	modified:   actividad.xhtml
	new file:   actividadusuario.xhtml
	modified:   asignarActividad.xhtml
	deleted:    control/actividad/Create.xhtml
	deleted:    control/actividad/Edit.xhtml
	deleted:    control/actividad/List.xhtml
	deleted:    control/actividad/View.xhtml
	deleted:    control/auditoria/Create.xhtml
	deleted:    control/auditoria/Edit.xhtml
	deleted:    control/auditoria/List.xhtml
	deleted:    control/auditoria/View.xhtml
	deleted:    control/bandeja/Create.xhtml
	deleted:    control/bandeja/Edit.xhtml
	deleted:    control/bandeja/List.xhtml
	deleted:    control/bandeja/View.xhtml
	deleted:    control/clasificacion_proceso/Create.xhtml
	deleted:    control/clasificacion_proceso/Edit.xhtml
	deleted:    control/clasificacion_proceso/List.xhtml
	deleted:    control/clasificacion_proceso/View.xhtml
	deleted:    control/clasificacion_rol/Create.xhtml
	deleted:    control/clasificacion_rol/Edit.xhtml
	deleted:    control/clasificacion_rol/List.xhtml
	deleted:    control/clasificacion_rol/View.xhtml
	deleted:    control/clasificacion_tarea/Create.xhtml
	deleted:    control/clasificacion_tarea/Edit.xhtml
	deleted:    control/clasificacion_tarea/List.xhtml
	deleted:    control/clasificacion_tarea/View.xhtml
	deleted:    control/clasificacion_usuario/Create.xhtml
	deleted:    control/clasificacion_usuario/Edit.xhtml
	deleted:    control/clasificacion_usuario/List.xhtml
	deleted:    control/clasificacion_usuario/View.xhtml
	deleted:    control/cola_de_tarea/Create.xhtml
	deleted:    control/cola_de_tarea/Edit.xhtml
	deleted:    control/cola_de_tarea/List.xhtml
	deleted:    control/cola_de_tarea/View.xhtml
	deleted:    control/condicion/Create.xhtml
	deleted:    control/condicion/Edit.xhtml
	deleted:    control/condicion/List.xhtml
	deleted:    control/condicion/View.xhtml
	deleted:    control/contador_round_robin/Create.xhtml
	deleted:    control/contador_round_robin/Edit.xhtml
	deleted:    control/contador_round_robin/List.xhtml
	deleted:    control/contador_round_robin/View.xhtml
	deleted:    control/destinatario/Create.xhtml
	deleted:    control/destinatario/Edit.xhtml
	deleted:    control/destinatario/List.xhtml
	deleted:    control/destinatario/View.xhtml
	deleted:    control/documento/Create.xhtml
	deleted:    control/documento/Edit.xhtml
	deleted:    control/documento/List.xhtml
	deleted:    control/documento/View.xhtml
	deleted:    control/equivalencia_tiempo/Create.xhtml
	deleted:    control/equivalencia_tiempo/Edit.xhtml
	deleted:    control/equivalencia_tiempo/List.xhtml
	deleted:    control/equivalencia_tiempo/View.xhtml
	deleted:    control/grupo/Create.xhtml
	deleted:    control/grupo/Edit.xhtml
	deleted:    control/grupo/List.xhtml
	deleted:    control/grupo/View.xhtml
	deleted:    control/grupo_politica_tarea/Create.xhtml
	deleted:    control/grupo_politica_tarea/Edit.xhtml
	deleted:    control/grupo_politica_tarea/List.xhtml
	deleted:    control/grupo_politica_tarea/View.xhtml
	deleted:    control/instancia/Create.xhtml
	deleted:    control/instancia/Edit.xhtml
	deleted:    control/instancia/List.xhtml
	deleted:    control/instancia/View.xhtml
	deleted:    control/mensaje/Create.xhtml
	deleted:    control/mensaje/Edit.xhtml
	deleted:    control/mensaje/List.xhtml
	deleted:    control/mensaje/View.xhtml
	deleted:    control/organizacion/Create.xhtml
	deleted:    control/organizacion/Edit.xhtml
	deleted:    control/organizacion/List.xhtml
	deleted:    control/organizacion/View.xhtml
	deleted:    control/periodo/Create.xhtml
	deleted:    control/periodo/Edit.xhtml
	deleted:    control/periodo/List.xhtml
	deleted:    control/periodo/View.xhtml
	deleted:    control/periodo_grupo_proceso/Create.xhtml
	deleted:    control/periodo_grupo_proceso/Edit.xhtml
	deleted:    control/periodo_grupo_proceso/List.xhtml
	deleted:    control/periodo_grupo_proceso/View.xhtml
	deleted:    control/politica/Create.xhtml
	deleted:    control/politica/Edit.xhtml
	deleted:    control/politica/List.xhtml
	deleted:    control/politica/View.xhtml
	deleted:    control/politica_round_robin/Create.xhtml
	deleted:    control/politica_round_robin/Edit.xhtml
	deleted:    control/politica_round_robin/List.xhtml
	deleted:    control/politica_round_robin/View.xhtml
	deleted:    control/post/Create.xhtml
	deleted:    control/post/Edit.xhtml
	deleted:    control/post/List.xhtml
	deleted:    control/post/View.xhtml
	deleted:    control/post_en_bandeja/Create.xhtml
	deleted:    control/post_en_bandeja/Edit.xhtml
	deleted:    control/post_en_bandeja/List.xhtml
	deleted:    control/post_en_bandeja/View.xhtml
	deleted:    control/prioridad/Create.xhtml
	deleted:    control/prioridad/Edit.xhtml
	deleted:    control/prioridad/List.xhtml
	deleted:    control/prioridad/View.xhtml
	deleted:    control/prioridad_mensaje_en_linea/Create.xhtml
	deleted:    control/prioridad_mensaje_en_linea/Edit.xhtml
	deleted:    control/prioridad_mensaje_en_linea/List.xhtml
	deleted:    control/prioridad_mensaje_en_linea/View.xhtml
deleted:    control/proceso/Create.xhtml
	deleted:    control/proceso/Edit.xhtml
	deleted:    control/proceso/List.xhtml
	deleted:    control/proceso/View.xhtml
	deleted:    control/regla_transicion/Create.xhtml
	deleted:    control/regla_transicion/Edit.xhtml
	deleted:    control/regla_transicion/List.xhtml
	deleted:    control/regla_transicion/View.xhtml
	deleted:    control/reporte/Create.xhtml
	deleted:    control/reporte/Edit.xhtml
	deleted:    control/reporte/List.xhtml
	deleted:    control/reporte/View.xhtml
	deleted:    control/reporte_rol/Create.xhtml
	deleted:    control/reporte_rol/Edit.xhtml
	deleted:    control/reporte_rol/List.xhtml
	deleted:    control/reporte_rol/View.xhtml
	deleted:    control/rol/Create.xhtml
	deleted:    control/rol/Edit.xhtml
	deleted:    control/rol/List.xhtml
	deleted:    control/rol/View.xhtml
	deleted:    control/sesion/Create.xhtml
	deleted:    control/sesion/Edit.xhtml
	deleted:    control/sesion/List.xhtml
	deleted:    control/sesion/View.xhtml
	deleted:    control/skin/Create.xhtml
	deleted:    control/skin/Edit.xhtml
	deleted:    control/skin/List.xhtml
	deleted:    control/skin/View.xhtml
	deleted:    control/tarea/Create.xhtml
	deleted:    control/tarea/Edit.xhtml
	deleted:    control/tarea/List.xhtml
	deleted:    control/tarea/View.xhtml
	deleted:    control/tarea_rol/Create.xhtml
	deleted:    control/tarea_rol/Edit.xhtml
	deleted:    control/tarea_rol/List.xhtml
	deleted:    control/tarea_rol/View.xhtml
	deleted:    control/transicion/Create.xhtml
	deleted:    control/transicion/Edit.xhtml
	deleted:    control/transicion/List.xhtml
	deleted:    control/transicion/View.xhtml
	deleted:    control/usuario/Create.xhtml
	deleted:    control/usuario/Edit.xhtml
	deleted:    control/usuario/List.xhtml
	deleted:    control/usuario/View.xhtml
	deleted:    control/usuario_grupo_rol/Create.xhtml
	deleted:    control/usuario_grupo_rol/Edit.xhtml
	deleted:    control/usuario_grupo_rol/List.xhtml
	deleted:    control/usuario_grupo_rol/View.xhtml
	renamed:    index_1.xhtml -> index.xhtml