Merge branch 'master' of github.com:olarin/xbmc-tvrain-subscription
Merge branch 'master' of github.com:olarin/xbmc-tvrain-subscription