trash
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/BaseObject/BaseObjectManager.class