Delete AddTaskAdapter.class

delete
1
Merge branch 'AndrewBranch' of https://github.com/andrewgtv/TourPilot.git into AndrewBranch
11
1
Merge branch 'master' into AndrewBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$3$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$3.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ManualInputActivity.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/WorkersActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PatientsDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/ManualInputAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/WorkEmploymentAdapter.class
	TourPilot/src/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/ManualInputActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/WorkersActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/PatientsDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/PinDialog.java
123
tras
Delete AdditionalWorksActivity$1.class
Delete AdditionalWorksActivity$2$1.class
Delete AdditionalWorksActivity$2$2.class
Delete AdditionalWorksActivity$2.class
Delete AdditionalWorksActivity$3$1.class
Delete AdditionalWorksActivity$3.class
Merge branch 'AndrewBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$3$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$3.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity.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/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Patient/Patient.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Work/Work.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/BaseDialog.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/IntervalInputDialog$3.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog$2.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog$3.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog.class
	TourPilot/src/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/PatientsActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/WorkersActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Patient/Patient.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/BaseDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/PinDialog.java
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/TasksActivity.class
trash
Merge branch 'master' into VladimirsBranch

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ManualInputActivity.class
	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/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/Task.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Dialogs/PinDialog$3.class
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-hdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-mdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xhdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_cancel.png
	TourPilot/bin/resources.ap_