Added drag-drop to notes
Merge origin/master