rearranged string ids
Merge branch 'master' of https://github.com/StateOfTheArt89/Twitch.tv-on-XBMC
fixed previous merge error