Resolve conflict
bandeja en expedientes
mensaje
Merge branch 'Reingenieria' of github.com:movihus/gexip into Reingenieria

Conflicts:
	app/views/expedientes/index.html.erb