Pull in old editor code
Merge branch 'master' of github.com:pomagma/puddle