Funcion Eliminar y activar

CRUDS
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/catalogos.php
	application/models/registros_model.php
	application/views/catalogos/vwCatalogoSelected.php
	application/views/catalogos/vwHeader.php
	js/jquery.js