Merge of fernetmenta's xbmc branch with spotyxbmc2