Some kind of server changes from WM, not sure what though
Merge branch 'master' of https://github.com/nandrea1/alarm-clock
Added Socket Based Alarm Set and Silence Functions, also added capability to record users as they go to site as well as how many sockets they have open