d
Merge branch 'master' into AndrewBranch
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_