Cambios
Merge branch 'master' of https://github.com/estrategasdigitales/nidorino

Conflicts:
	application/views/admin/categorias.php