Merge pull request #2022 from ronie/skin-startup

Always load Startup.xml

diff --cc xbmc/GUIInfoManager.cpp
Simple merge

diff --cc xbmc/GUIInfoManager.h
Simple merge

diff --cc xbmc/addons/Skin.cpp
Simple merge

diff --cc xbmc/addons/Skin.h
Simple merge