d
Merge branch 'master' into AndrewBranch
qwqd
11
1
s
\
''
\
Merge remote-tracking branch 'origin/master'

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	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/WorkersActivity$1.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/bin/dexedLibs/android-support-v4-1911576849660653e459537ca11a7964.jar
	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-hdpi/ic_action_empty.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-mdpi/ic_action_empty.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-xhdpi/ic_action_empty.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_accept.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_cancel.png
	TourPilot/bin/res/crunch/drawable-xxhdpi/ic_action_empty.png
	TourPilot/bin/resources.ap_
Merge branch 'master' into AndrewBranch

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	TourPilot/bin/classes/.gitignore
	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/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/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/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Patient/PatientManager.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/DataBase/DataBaseWrapper.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.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_
	TourPilot/gen/.gitignore
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/PatientsActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/SynchronizationActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/ToursActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Option/Option.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Task/Task.java
	TourPilot/src/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.java
changes in tasks
asd
Employment
asd
asd
asd
Merge branch 'AndrewBranch' of https://github.com/andrewgtv/TourPilot.git into AndrewBranch
asdad
Merge branch 'master' into AndrewBranch

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/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.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$string.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$style.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/EmploymentAdapter$EmploymentHolder.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/EmploymentAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/TaskAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/WorkerAdapter.class
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/src/isebase/cognito/tourpilot/Templates/EmploymentAdapter.java
asdasd
changes in patient manager