Editor work for merge

Combines my DrawModeWork, UndoAddMultiple & DragBox Filter branches into one branch so that I could resolve conflicts between them.