ultimos arreglos
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/models/Taxi.php
arreglo merge
Merge remote-tracking branch 'Diego/master'

Conflicts:
	protected/controllers/ClienteController.php