More websocket work
Atmosphere plugin working
Merge branch 'master' into websocket