c/s comm updates (unfinished)
Merge remote-tracking branch 'origin/Tools'
Merge remote-tracking branch 'origin/Tools'

Conflicts:
	client/Canvas.js
working client/server wobject relay