server part 1
Merge branch 'master' of github.com:franco-d/BubbleMind