Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1
Mantis #4446 : Fix recording resume support when singleseat is in use. (MediaType.Recording should not change to MediaType.Video but only when MediaType.Music is involved when playing music/video files like .mp4)
Merge branch 'BUG-4446-In_singleseat_the_played_duration_of_a_recording_is_not_stored_for_resume'
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1