trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class