better java support and more robustness on bad disconnect
Merge branch 'master' of https://github.com/AndreasDahl/SimpleHighscoreServer

Conflicts:
	server/server.py