Drag&Drop fixes
Merge branch 'master' of github.com:sapo/pink