bugfix changed how I call sockets in control.js
Merge branch 'master' into gh-pages