добавил iml
добавил что-то
Merge branch 'master' of https://github.com/oss-fruct-org/mytrips

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

Conflicts:
	audioguide/AudioGuide/AudioGuide.iml
	audioguide/audioguide.iml
Последняя версия, исправил проблемы кодировок в интерфейсе
Merge branch 'master' of https://github.com/oss-fruct-org/mytrips