removed rcon, since its not used
Merge branch 'websockets'