Merge branch 'coverart_class' into testing

Conflicts:
	picard/ui/options/cover.py
	picard/ui/ui_options_cover.py
Merge branch 'info_dialog2' into testing
Merge branch 'QNetwork_cache_control' into testing