Updating it!
Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	BusDriver/src/br/peoplebus/busdriver/connection/CommunicationService.java