Improvements

Active stream highlighting improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	addon.xml
	changelog.txt
	nbcsn.py