Changed Nederland 24 to NPO, all channel logo's updated
Merge branch 'master' into testing

* master:
  Release 4.2.3 - Gotham (fix - site change)
  add token required by site change, fixes issue #7

Conflicts:
	addon.xml
cleans up channel descriptions
fixes python ascii error
improve artwork
reverts icon, further improves artwork
fixes settings
rebranded npo