code simplification
new style bitmap cache (taken from covers_sync branch)
Merge branch 'master' into covers_sync
repackaging
Merge branch 'master' into covers_sync