Fixed bugs that cause server crash and complete refactor/reorganization of server side code
Merge pull request #88 from malucky/dev

Fixed bugs that cause server crash and complete refactor/reorganization of server-side code