Fixed server bug where it would become unresponsive if trying to stop server with clients connected
Merge branch 'master' of https://github.com/DeathJockey/INDS

Conflicts:
	server_data/config.xml