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

Conflicts:
	TourPilot/src/isebase/cognito/tourpilot/Activity/TasksActivity.java