StringParser
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
commit
commit
commit
Merge branch 'master' into AndrewsBuisnessClasesBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
readUnpack changings
Merge pull request #22 from andrewgtv/AndrewsBuisnessClasesBranch

Andrews buisness clases branch
sas
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/src/isebase/cognito/tourpilot/Connection/ConnectionAsyncTask.java
changes in db
commiting junk
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
changes in db
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
Adding forServer override and cheksums
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
Changes in DbWrapper, in parser, in activities
back button in syncronization
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/src/isebase/cognito/tourpilot/Activity/SynchronizationActivity.java