Make Subcat a option via settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	addon.xml
	changelog.txt
	resources/language/English/strings.po
	resources/lib/main.py
	resources/lib/parsers.py
	resources/settings.xml