adaa
Manual input and Employment intervals
1
12
1
1
1
1
Merge branch 'AndrewBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Address/Address.class
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/AndroidManifest.xml
	TourPilot/bin/AndroidManifest.xml
	TourPilot/bin/classes/.gitignore
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalTasks/AdditionalTasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/AdditionalWorksActivity.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/DoctorsActivity.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.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/RelativesActivity.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$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/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/AdditionalTask/AdditionalTask.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Address/Address.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Doctor/Doctor.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Doctor/DoctorManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Employment/Employment.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.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/Relative/Relative.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Relative/RelativeManager.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/Dialogs/BaseDialog.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.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$color.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$dimen.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/R$drawable.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/AddressAdapter.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/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
	TourPilot/gen/.gitignore
	TourPilot/gen/isebase/cognito/tourpilot/R.java
	TourPilot/res/layout/activity_manual_input.xml
	TourPilot/res/layout/row_employment_template.xml
	TourPilot/res/values/colors.xml
	TourPilot/res/values/strings.xml
	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/ToursActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Activity/WorkersActivity.java
	TourPilot/src/isebase/cognito/tourpilot/Connection/ConnectionAsyncTask.java
	TourPilot/src/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Information/Information.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Patient/PatientManager.java
	TourPilot/src/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/BaseDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Dialogs/PinDialog.java
	TourPilot/src/isebase/cognito/tourpilot/Templates/EmploymentAdapter.java
	TourPilot/src/isebase/cognito/tourpilot/Utils/DateUtils.java