Funcionalidad básica en correr el expediente
Merge branch 'origin/Reingenieria'

Conflicts:
	app/controllers/expedientes_controller.rb
	app/views/expedientes/show.html.erb
Merge branch 'origin/Reingenieria'
Merge branch 'origin/Reingenieria'
Merge branch 'origin/Reingenieria'
Pequeños cambios en show expedientes