Fixed ws connection closing bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	XTSMserver.py