.
Merge remote-tracking branch 'Diego/master'

Conflicts:
	protected/controllers/ClienteController.php
	protected/runtime/application.log
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	protected/models/Taxi.php