TEst
Merge branch 'master' of https://github.com/oss-fruct-org/mytrips

Conflicts:
	audioguide/.idea/gradle.xml
	audioguide/AudioGuide.iml