some fixes
Merge branch 'master' of https://github.com/ogeidix/collaborative_editing