Revert "working drag and drop"

This reverts commit 11f56c4d34214d2225bfc5f8e9462f5798608110.
Revert "Revert "working drag and drop""

This reverts commit af539b31181ffaa0e6a7a6a24ac71d2ee9d00aa5.
Merge remote-tracking branch 'origin/master'