Employment
asd
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