Merge remote-tracking branch 'remotes/upstream/master'
Add labelControl.Width when labelcontrol is not focused.
Merge remote-tracking branch 'remotes/origin/BUG-4229-Add_labelControl_Width_when_no_focused_GUISelectButtonControl'
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1

Conflicts:
	mediaportal/Configuration/App.config
Merge branch 'master' of https://github.com/hkjensen/MediaPortal-1

Conflicts:
	mediaportal/MediaPortal.Base/skin/Titan/titan.version.xml
background.psd
splash_custom.jpg