Merge remote-tracking branch 'remotes/origin/master' into MP1-4231-FEAT-Allow_plugins_as_Screensavers

Conflicts:
	mediaportal/Configuration/MediaPortal.Configuration.csproj
Merge remote-tracking branch 'remotes/origin/MP1-4231-FEAT-Allow_plugins_as_Screensavers'
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.0Fork