More Server Bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	SeaFoamServer-Python/simpleSocketClient.py
	SeaFoamServer-Python/simpleSocketServer.py