more bug fixing in editor.
Merge branch 'master' of https://github.com/oehm/Frohdo