MP1-4117 Fix progress window when movie grabber follows nfo import
MP1-4117 Clear thumbs on reset database
Merge remote-tracking branch 'remotes/upstream/MP1-4117-NFO_importer_logic_needs_change' into 1.5.0Fork
Merge remote-tracking branch 'remotes/origin/MP1-4070_BUG_Resuming_from_Standby_not_working'

Conflicts:
	mediaportal/Core/Mixer/MasterVolumeHelper.cs
Merge remote-tracking branch 'remotes/origin/MP1-4247-BUG-Wave_volume_settings_has_Mute_Unmute_issue'
MP1-4070 : Fix NET4 warning (MasterVolumeHelper.cs was not resolved correctly)
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.0Fork

Conflicts:
	mediaportal/Core/Mixer/MasterVolumeHelper.cs