editor-magic and shit
-
-
-
Merge remote-tracking branch 'origin/Editor'