fix
Merge branch 'master' of https://github.com/Sets88/xbmc-cherrymusic