Handling simulator thread termination more gracefully.
Merge branch 'master' of https://github.com/brainteam/BrainSphere.git

Conflicts:
	BrainSphere/src/brainteam/client/Client.java