Merge branch 'master' of https://github.com/superphunthyme/xbmc-cbc-plugin

Conflicts:
	addon.py
	resources/lib/CBCParse.py
Merge branch 'master' of https://github.com/superphunthyme/xbmc-cbc-plugin