some socket stuff
minor changes
minor changes
Merge branch 'master' into front_end_js
minor changes
minor changes