refactored socket handling code
Merge branch 'master' of https://github.com/Sloth6/Beacon
server objects change
Merge branch 'master' of https://github.com/Sloth6/Beacon