Merge branch 'master' of https://github.com/splatterpop/MediaPortal-1

Conflicts:
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem GÃ¶teborg.xml
	mediaportal/Core/Player/PlaneScene.cs
	mediaportal/WindowPlugins/GUIMusic/GUIMusicFiles.cs
Merge branch 'master' into bluray-test

Conflicts:
	TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem GÃ¶teborg.xml