Removed redundant references
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into BUG_4240_Use_existing_skin_choice
Merge branch 'BUG_4240_Use_existing_skin_choice'
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music
Renamed StreamCopycs.cs back to StreamCopy.cs
Added back radio GFX removed in error
Merge branch 'FEAT-3695-Rework_BASS_implementation'
Merge branch 'master' of http://github.com/MediaPortal/MediaPortal-1 into FEAT_Last.fm_API_2.0

Conflicts:
	mediaportal/Configuration/Sections/Music.cs
	mediaportal/Configuration/SettingsUpgradeManager.cs
	mediaportal/Core/Player/PlayerFactory.cs
	mediaportal/Core/Util/Util.cs
	mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs
Merge remote-tracking branch 'remotes/upstream/master' into 1.3Final_ADDON3_TV_Music

Conflicts:
	mediaportal/Core/Core.csproj
Merge remote-tracking branch 'remotes/upstream/FEAT_Last.fm_API_2.0' into 1.3Final_ADDON3_TV_Music

Conflicts:
	mediaportal/Core/Util/Util.cs
	mediaportal/LastFMLibrary/LastFMLibrary.csproj
	mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs
Merge branch '1.3Final_ADDON3_TV_Music' into 1.3Final_ADDON3_TV_Music_Half-Full-Screen