;
Merge remote-tracking branch 'origin/master'

Conflicts:
	TravelInformation/bin/TravelInformation.apk
	TravelInformation/bin/classes.dex
	TravelInformation/bin/resources.ap_