1
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/TasksActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Activity/ToursActivity.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Option/Option.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/Task.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
	TourPilot/bin/resources.ap_
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java