asdasd
Merge branch 'BogdansBranch' of ssh://git@github.com/andrewgtv/TourPilot.git into BogdansBranch
q
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
DB changes
DB Changes
ssd