Merge pull request #332 from adaptlearning/menu-drag-drop

Menu drag drop
Merge branch 'develop' into menu-drag-drop