g
xz
er
asdas
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml