xbmc-addon-xvdr: add support for xbmc-addon-xvdr-master
Merge branch 'xbmc-addon-xvdr-master' into merge