WebSockets integration step 2
Merge remote-tracking branch 'origin/master'
Merge branch 'master' with player sockets changes into game-logic-events