Merge pull request #36 from aenario/master

[BUGFIX] update editor with latest changes
[refactoring] replacing Tree Model