xbmc: add PR2505
Merge remote-tracking branch 'upstream/master' into openelec-settings
xbmc-addon-settings: update to xbmc-addon-settings-0.1.6