asdasd
Merge branch 'master' of https://github.com/andrewgtv/TourPilot.git

Conflicts:
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes.dex
	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/Employment/EmploymentManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Templates/EmploymentAdapter.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Utils/DateUtils.class
	TourPilot/bin/resources.ap_
	TourPilot/res/layout/activity_patients.xml
	TourPilot/src/isebase/cognito/tourpilot/Data/Employment/EmploymentManager.java
	TourPilot/src/isebase/cognito/tourpilot/Data/Task/TaskManager.java
	TourPilot/src/isebase/cognito/tourpilot/Templates/EmploymentAdapter.java
	TourPilot/src/isebase/cognito/tourpilot/Utils/DateUtils.java