Leaving Tasks
weer
Merge branch 'master' of ssh://git@github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/resources.ap_
werew
Leaving patient
leaving patient
Save before type task results
TCP, IWP..
1
Delete WorkStopDialog$1.class
Delete WorkTypeDialog$1.class
Delete WorkTypeDialog$2.class
Delete WorkStopDialog.class
Delete WorkTypeDialog.class
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity.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/Connection/ConnectionAsyncTask.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/Address/Address.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/WorkTypeDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/values/strings.xml
	TourPilot/src/isebase/cognito/tourpilot/Activity/BaseActivity.java
1
DialogTaskResult
taskDialogResult
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$2$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$2$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/PatientsActivity.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/Data/Address/Address.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/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/menu/patients_menu.xml
	TourPilot/res/values/strings.xml
DialogTaskResult