Merge master&dev to dev

Merge into dev branch, master and dev and some code refactoring in editor.js
Lets skip the module classes by now creating a new branch