trash
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_synchronization.xml
changes in manifest
qweqwe
add IAddress
Merge branch 'master' into VladimirsBranch

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_synchronization.xml