clean up code
merge with upstream
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
prevent playlist reordering when it is locked
Merge pull request #22 from kain88-de/bug_1192075

Check for playlist locks when re-ordering or dropping to table view.