Editor

Merge editor with master so as to keep master up to date with working editor code