Updated DVB-C tuning parameters for Ziggo the Netherlands [021013] (thanks Lbr_Lion)
Updated Tuningdetails DVB-C Germany.Kabel Deutschland (KDG) Hamburg und Südholstein (thanks nocadmin)
MP1-4258 : Revert BeginInvoke to avoid freeze.
MP1-4262 : Catch exception to avoid crash in LastFMScrobbler.cs 'OnPlayBackStarted'.
MP1-4258 : Catch exception to avoid crash when .cue files are not present.
Merge remote-tracking branch 'remotes/origin/BUG_AMG_Scraper_NUGET'
Merge remote-tracking branch 'remotes/origin/MP1-4258-BUG-BASS_should_raise_g_player_events'
Merge remote-tracking branch 'remotes/origin/master' into FEAT_Last.fm_API_2.0

Comment out 'artist = AudioscrobblerBase.UndoArtistPrefix(song.Artist);' from GUIMusic/GUIMusicBaseWindow.cs (need to be fixed)
Look for 'Fix ME' in GUIMusic/GUIMusicBaseWindow.cs.

Conflicts:
	mediaportal/MediaPortal.sln
	mediaportal/WindowPlugins/GUIMusic/GUIMusicPlayingNow.cs
MP1-4262 : Revolve merging issue.
Merge remote-tracking branch 'remotes/upstream/master' into 1.5.0Fork

Conflicts:
	mediaportal/Core/MusicPlayer/BASS/BassAudioEngine.cs
	mediaportal/WindowPlugins/GUIMusic/GUIMusicPlayingNow.cs
Merge remote-tracking branch 'remotes/upstream/FEAT_Last.fm_API_2.0' into 1.5.0Fork

Conflicts:
	mediaportal/MediaPortal.sln
	mediaportal/ProcessPlugins/LastFMScrobbler/LastFMScrobbler.cs
	mediaportal/WindowPlugins/GUIMusic/GUIMusicBaseWindow.cs