Merge remote-tracking branch 'remotes/origin/master' into EXP-Added_Option_to_play_TS_Files_with_Movie_Codec

Conflicts:
	mediaportal/Core/Player/g_player.cs
Fixed inconsistent CR/LF endings, which were caused by incorrect settings of git client
Merge branch 'BUG-4372-Crash_when_closing_MediaPortal_while_Music_is_Playing'
Merge remote-tracking branch 'remotes/origin/EXP-Added_Option_to_play_TS_Files_with_Movie_Codec'
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB