edit success
Merge branch 'master' of https://github.com/huyvu1310/CatchCar.git

Conflicts:
	src/vn/edu/ptit/android/activity/OfferTripActivity.java