Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next

Conflicts:
	make.sh

diff --cc make.sh
index 4450800d074d594fc2cd7b9f5608c958e7ff43b6,4f40b4603d9c864fc46b437bcbdef7486214464e..83d73957f18676963659a49356c57a921f9e5d16
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -683,6 -676,6 +683,7 @@@ buildipfire() 
    ipfiremake ffmpeg
    ipfiremake vdr
    ipfiremake vdr_streamdev
++  ipfiremake vdr_vnsiserver5
    ipfiremake vdr_vnsiserver3
    ipfiremake vdr_epgsearch
    ipfiremake vdr_dvbapi