Merge pull request #5 from punker76/master

fix for shortcut bug
only format
add simple drag drop for shortcuts
Merge remote-tracking branch 'upstream/master'