Merge branch 'dragdrop'
Merge branch 'editor'
Icon Grundgerüst
Merge branch 'master' into editor