trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Connection/ServerCommandParser.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Task/TaskManager.class
trash
Merge branch 'BogdansBranch'

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class
	TourPilot/bin/classes/isebase/cognito/tourpilot/DataBase/DataBaseWrapper.class
Merge branch 'BogdansBranch'
trash
Merge branch 'BogdansBranch'
Merge branch 'BogdansBranch'
add user remarks
add user remarks