context menu, dnd, muscimanager refactor
Merge branch 'context-menu-refactor' into develop