Included changes from master and resolved conflict
Merge remote-tracking branch 'origin' into FEAT_Last.fm_API_2.0

Conflicts:
	mediaportal/Core/PlayList/PlayListPlayer.cs
	mediaportal/WindowPlugins/WindowPlugins.csproj