minor tweaks

..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/spinnytea/tools/net/Server.java