Updated channellogos
Updated drivers
vdr-iptv: Add vlc2iptv
drivers: Add missing changes
Merge branch 'master' into next

Conflicts:
	plugins/vdr-iptv/PKGBUILD