Updated oscam
Updated vdr-softhddevice
Merge branch 'master' into next

Conflicts:
	plugins/vdr-softhddevice/PKGBUILD