Merge remote-tracking branch 'teamxbmc/master'
Merge branch 'master' of https://github.com/margro/xbmc
Merge branch 'master' of https://github.com/margro/xbmc
Confluence: fix default EPG background color for PVR addons that only use genre strings
(GenreType = 0x100)