Sockets update; needs more debugging but currently more stable.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/index.html
Sockets update; needs more debugging but currently more stable.