Merge remote-tracking branch 'remotes/origin/master' into BUG-3920_mtn.exe_does_not_generate_thumbs_for_all_video_files
DVB-T tuning parameters for UK.Mendip and UK.Winter Hill updated (due to 4G changes)
Mantis #4322 : Optimization Thumbnail Generation.
Modified Util/Util.cs to allow merge to master branch
Merge branch 'EXP-4060-THUMBNAIL_Remoting_Setup'

Conflicts:
	mediaportal/Core/Util/Util.cs
Merge remote-tracking branch 'remotes/origin/master' into BUG-3920_mtn.exe_does_not_generate_thumbs_for_all_video_files

Conflicts:
	mediaportal/Core/Util/Util.cs
Kill ffmpeg process for installer.
Merge branch 'BUG-3920_mtn.exe_does_not_generate_thumbs_for_all_video_files'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music

Conflicts:
	TvEngine3/TVLibrary/Setup/setup.nsi
	mediaportal/Core/Util/Util.cs
Merge remote-tracking branch 'remotes/origin/master' into BUG-4322-Thumbnail_Generate_is_slow_for_Picture_v4

Conflicts:
	mediaportal/Configuration/Sections/GuiThumbs.cs
	mediaportal/Core/Util/Util.cs
	mediaportal/Core/Util/VideoThumbCreator.cs
	mediaportal/WindowPlugins/GUISettings/General/GUI/GUISettingsGUI_Thumbnails.cs
Merge remote-tracking branch 'remotes/origin/BUG-4322-Thumbnail_Generate_is_slow_for_Picture_v4'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music

Conflicts:
	mediaportal/Core/Core.csproj
	mediaportal/Core/Util/Util.cs
	mediaportal/Core/Util/VideoThumbCreator.cs
	mediaportal/WindowPlugins/GUIPictures/GUIPictures.cs
	mediaportal/WindowPlugins/GUISettings/MyPictures/GUISettingsPictures_Database.cs