Merge branch 'hotfix/0.1.11'

* hotfix/0.1.11:
  improve editor.css padding
add main.js where it should be loaded
Merge branch 'hotfix/0.1.12' into develop

* hotfix/0.1.12:
  add main.js where it should be loaded