butitás javítás
Merge remote-tracking branch 'origin/ThreadLess' into ThreadLess

Conflicts:
	intelligence/src/agent/AgentManager.java