Merge branch 'master' of https://github.com/herder/ab-xbmc

Conflicts:
	default.py