branching to bypelabs
websocket update
touch adaptation
Merge branch 'bypelabs'

Conflicts:
	lusor.js
	tools/deploy.js