Merge branch 'master' of https://github.com/cardinot/mixxx into coverArtSupport
Merge branch 'coverArtSupport' of https://github.com/cardinot/mixxx into coverArtSupport_2
Merge branch 'coverArtSupport_2' of https://github.com/cardinot/mixxx into coverArtSupport_3