Merge remote-tracking branch 'upstream/EXP-TsReader_noStopMod' into Disaster123MP-EXP-TV-MP-TVE3.5-NET4

Conflicts:
	Common-MP-TVE3/External/Gentle.NET/Source/SolutionInfo.cs
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Jonkoping.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/Switzerland.UPC Cablecom [DE-FR].xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.Aalsmeer-Uithoorn (ID 2257).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW (ID 2249).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Basic-pakket (ID 2250).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Doorn (ID 3667).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Hilvarenbeek (ID 4458).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_IJsselstein (ID 7224).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Loenen (ID 5636).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Maassluis (ID 6227).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Midden-Holland (ID 4683).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Schiedam (ID 7244).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.CAIW_Test_intern (ID 8378).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.Capelle_a-d_IJssel (ID 2273).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.Oudenbosch (ID 6536).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbc/The Netherlands.REKAM (ID 777).xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/Brazil.All Regions.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/Germany.Hannover.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Wheatstone Road.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Invercargill - Forest Hill.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Whakaroa.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairoa.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Timaru - Cave Hill.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/New Zealand.Wairarapa - Popoiti.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/TuningParameters/dvbt/Norway.Vestfold - Larvik.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/WebEPG/grabbers/CH/3-www_tvtv_ch.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/WebEPG/grabbers/FI/www_telkku_com.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/WebEPG/grabbers/PL/gazeta_pl.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/WebEPG/grabbers/PL/gazetaecho_pl.xml
	TvEngine3/Mediaportal/TV/Server/TVServer.Base/WebEPG/grabbers/SE/tvplaneten_tv4_se.xml
	TvEngine3/TVLibrary/Setup/setup.nsi
	TvEngine3/TVLibrary/SetupTv/App.config
	TvEngine3/TVLibrary/SetupTv/Sections/CardAtsc.Designer.cs
	TvEngine3/TVLibrary/SetupTv/Sections/CardDvbIP.Designer.cs
	TvEngine3/TVLibrary/SetupTv/Sections/Epg.Designer.cs
	TvEngine3/TVLibrary/SetupTv/Sections/Project.designer.cs
	TvEngine3/TVLibrary/TVDatabase/references/Gentle.Common.dll
	TvEngine3/TVLibrary/TVDatabase/references/Gentle.Framework.dll
	TvEngine3/TVLibrary/TVDatabase/references/Gentle.Provider.MySQL.dll
	TvEngine3/TVLibrary/TVDatabase/references/Gentle.Provider.SQLServer.dll
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Christchurch - Infill.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Dunedin - Infill.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisborne - Wheatstone Road.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Gisbourne - Whakapunake.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Hawkes Bay - Hospital Hill.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Invercargill - Forest Hill.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Nelson - Gramians.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Southland - Hedgehope.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Taupo - Whakaroa.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Tauranga - Kopukairoa.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/New Zealand.Timaru - Cave Hill.xml
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Norway.Vestfold - Larvik.xml
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/GuideBase.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioGuideBase.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioRecorded.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVHome.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVHomeNavigator.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVZapOSD.cs
	TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs
	TvEngine3/TVLibrary/TvService/App.config
	mediaportal/Configuration/App.config
	mediaportal/Configuration/MediaPortal.Configuration.csproj
	mediaportal/MediaPortal.Application/App.config
missing files from merge