Correcion tiempo demorado v2
Merge remote-tracking branch 'origin/Reingenieria' into Reingenieria

Conflicts:
	config/routes.rb
reportes  tiempo demorados
tiempos demorados 2
Merge remote-tracking branch 'origin/Reingenieria' into Reingenieria