Taxi
Merge remote-tracking branch 'Diego/master'
Validacion de la asignacion de credito taxi
Flota
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/runtime/application.log