Add more broken websocket stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/index.html
Merge remote-tracking branch 'origin/master'