Merge pull request #2 from vegah/master

MERGEyay
UI: Drag&Drop bugfixes
Merge pull request #2 from Luzenna/master

Merge gui stuff, ass