Merge branch 'editor' of https://github.com/coimotion/coServ into editor