Merge latest changes from TVE 3.5 master.

Conflicts:
	TvEngine3/Mediaportal/TV/Server/TVLibrary/TimeShiftingEPGGrabber.cs
	TvEngine3/Mediaportal/TV/Server/TvControl/ServiceAgents/ServiceAgents.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Services/Epg/EpgCard.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Services/Scheduler/Scheduler.cs
	TvEngine3/Mediaportal/TV/Server/TvLibrary.Services/TVController.cs