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