checking pin on
kjh
Merge branch 'AndrewsConnectionBranch'

Conflicts:
	TourPilot/.gitignore
	TourPilot/bin/TourPilot.apk
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/OptionsActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/WorkersActivity.class