Merge remote-tracking branch 'remotes/origin/master' into MP1-4069-Migrate_to_NET4

Conflicts:
	mediaportal/Core/Core.csproj
	mediaportal/Core/MusicPlayer/Visualization/WinampViz.cs
Merge remote-tracking branch 'remotes/upstream/MP1-4069-Migrate_to_NET4' into 1.5.0Fork