.
Diagramas
.
Merge remote-tracking branch 'Diego/master'

Conflicts:
	protected/controllers/FlotaController.php
	protected/runtime/application.log
Activar, desactivar cliente