websocket
Merge branch 'webdev' into dev

Conflicts:
	maclient.py