test
Merge branch 'master' of https://github.com/HMSB/repository.hmb.xbmc.addons

Conflicts:
	addons.xml
	addons.xml.md5