webscokets confined to rooms
Merge branch 'websockets'