Taxi
Merge remote-tracking branch 'Diego/master'

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

Conflicts:
	protected/runtime/application.log