added XBMC fixes
Merge branch 'master' of https://github.com/ProfessorKaos64/RetroRig

Merge in test-pc commit