Added controlpanel
Added clean up after drag dialog finished or canceled
Merge remote-tracking branch 'upstream/master'