11
Merge branch 'master' into BogdansBranch

Conflicts:
	TourPilot/bin/classes/isebase/cognito/tourpilot/Data/Worker/WorkerManager.class