Heavy server refactoring (NOT TESTED)!
Merge branch 'master' of https://github.com/alongubkin/mosp.git