Fix websocket payload by removing Data field
Merge remote-tracking branch 'origin/beta-dev' into beta-dev

Conflicts:
	src/canopy/ws/canopy_ws.go