qw
changed verification view
Merge branch 'VladimirsBranch2'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/BaseActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/SynchronizationActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/UserRemarksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/VerificationActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ConnectionAsyncTask.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Address/Address.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Employment/Employment.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/InfoBaseDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/IntervalInputDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PatientsDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/Tasks/BlutdruckTaskDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/Tasks/StandardTaskDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$id.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$layout.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$menu.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AdditionalTaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/ManualInputAdapter.class