Merge branch 'master' into editor
Diff mapper + remove diff notes +  close brackets für Codemirror
Add Unit To Struct Methode hinzugefügt
Merge branch 'editor'
Merge branch 'master' into dragdrop

Conflicts:
	js/app.js