Re-added some of the JS changed in the other branch
Merge branch 'master' of https://github.com/FireAlarm/socketServer