retrieve from DB carpools
Merge remote-tracking branch 'origin/master'

Conflicts:
	myCarpooling/src/com/BARcode/mycarpooling/MainActivity.java