botones eliminar
botones eliminar en los catalogos
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/catalogosm/catalogosm.php