sync

sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectT/src/com/exmaple/activity/MakeTripTail.java