drag and drop refactor
Merge branch 'master' of github.com:megion/tabaga