Switch to new hostname for streaming server
Add multiple bit streams for TV2/Fyn
Use 24h channel for TV2/OJ
fixed merge conflict
Merge branch 'izzlazz-master'