Merge branch 'master' into MP1-4163-BUG-TV_Server_Disk_Quota_not_working
MP1-4202 : Comskip markers are now updated in MediaPortal.cs
- reverted changes in TVHome.cs and GUIVideoFiles.cs
- reverted changes in GUITVProgressControl.cs
- added #chapters and #jumppoints to PropertyManager.cs
- #TV.Record.chapters and #TV.Record.jumppoints do no longer exist
- so skin files have been modified
allow loading of directshow filters from file
MP1-4228
removed default value for method parameter
added copyright header
(MP1-4228)
MP1-4155: removed not necessary RTMP protocol parameters
MP1-4208
Added user group description tag in import/export
Merge remote-tracking branch 'remotes/origin/MP1-4069-Migrate_to_NET4'
Merge remote-tracking branch 'remotes/origin/MP1-4228-Allow_loading_of_directshow_filters_from_file'

Conflicts:
	mediaportal/Core/Core.csproj
Merge remote-tracking branch 'remotes/origin/MP1-4243-BUG-TV_Recordings_Thumb_Offset_not_working'
Merge remote-tracking branch 'remotes/origin/MP1-4202_ComSkip_markers_are_not_updated_correctly'
Merge remote-tracking branch 'remotes/origin/MP1-4163-BUG-TV_Server_Disk_Quota_not_working'
Merge remote-tracking branch 'remotes/upstream/MP1-4155-FEAT-Merge_of_IPTV_filter_and_MediaPortal_Url_Source_Splitter' into 1.5.0Fork

Conflicts:
	DirectShowFilters/MPUrlSourceSplitter/MPUrlSourceSplitter/MPUrlSourceSplitter_Protocol_Rtmp/MPUrlSourceSplitter_Protocol_Rtmp_Parameters.h
	DirectShowFilters/MPUrlSourceSplitter/MPUrlSourceSplitter/MPUrlSourceSplitter_Protocol_Rtmp/RtmpDownloadRequest.cpp
	DirectShowFilters/MPUrlSourceSplitter/MPUrlSourceSplitter/MPUrlSourceSplitter_Protocol_Rtmp/RtmpDownloadRequest.h
Merge remote-tracking branch 'remotes/upstream/MP1-4208-My_videos_nfo_importer_does_not_execute_usergroups_rules_after_import' into 1.5.0Fork
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.0Fork

Conflicts:
	mediaportal/Core/Core.csproj