serialize updates
Merge branch 'refs/heads/master' of ssh://git@github.com/webgme/webgme.git
Merge branch 'master' into server