ADDON V4 (Without Audio Channel Count)
Merge branch 'master' into FEAT-3758-Implement_Blu-ray_playback_support_ADDON_V4

Conflicts:
	mediaportal/WindowPlugins/GUIVideoFiles/GUIVideoFiles.cs
Merge remote-tracking branch 'remotes/origin/master' into FEAT-3758-Implement_Blu-ray_playback_support_ADDON_V4
Merge branch 'FEAT-4353-Blu-ray_playback_support_ADDON_V4'