parte de modifica tramite
Merge branch 'master' of https://github.com/yowik/gestion
modificar tramite
Merge branch 'master' of https://github.com/yowik/gestion

Conflicts:
	application/views/consultas/consultas_tramites.php