checando os nulls
Merge branch 'master' of https://github.com/bflesch/batmovel

Conflicts:
	Batmovel/src/br/usp/caronas/RideListActivity.java