Editar

Función editar lista :+1:
Merge branch 'master' of https://github.com/alejandrocan/ERP-G7Grafico

Conflicts:
	application/controllers/catalogos.php