Style update, some CSB issues with the popups
Merge branch 'master' of https://github.com/FireAlarm/socketServer