merging xbmc code

some xbmc code supporting specific site plus a bug in xbmc site of code