test
Merge branch 'master' of
https://github.com/map-travel/travel-Information

Conflicts:
	TravelInformation/res/values/strings.xml