chnages in tasks
add previous worker id
chnages in isAuto
add colors
repair address before save
ewe
wewe
ww
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/.gitignore
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalTasks/AdditionalTasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalTasks/CatalogsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AddressActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/BaseActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/CommentsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/DoctorsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/InfoActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ManualInputActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/NotesActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$3.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/RelativesActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/SynchronizationActivity$1.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$1.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/ConnectionStatus$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ConnectionStatus.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/AdditionalTask/AdditionalTask.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/AdditionalWork/AdditionalWork.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Diagnose/Diagnose.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Diagnose/DiagnoseManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Doctor/Doctor.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Information/Information.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Patient/Patient.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Patient/PatientManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/PatientRemark/PatientRemark.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Relative/Relative.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/Task$eTaskState.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/Task.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/DialogInfoBase.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/DialogPin.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/EventHandle/SynchronizationHandler.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/AddTaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/TaskAdapter$TasktHolder.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/TaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/WorkerAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
	TourPilot/bin/resources.ap_
changes in address
77
Merge branch 'master' into VladimirsBranch
ss
g
11
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity$1.class
sad
changes in address
11
s