fixed thread management and more
Merge branch 'develop' of https://github.com/golvmopp/BGSEP into develop

Conflicts:
	server.jar