ajustes
Tabla intermedia gestiona trasplante medula (crear, modificar)
Tabla intermedia gestiona trasplante medula (eliminar, habilitar)
Tabla intermedia gestiona trasplante organo(crear,modificar,eliminar, habilitar)
Merge origin/ramaNuevaVale

Conflicts:
	protected/runtime/application.log