[MakeFile] reserves for now as it depends on TransStreaming Proxy.
[TransCodeSetup] fix some issues with OpenWebIf.
[AutoBouquetMaker] fix area config for DVB-T.
[OUG] QuickFix, Thanks DEG!
[AutoBouquetMaker] sort 'FreeSat' areas, you will need to setup this provider.
[AutoBouquetMaker] add 'FreeView' provider, currently only SD channels are supported, but we are working on HD support.
[TransCodeSetup] fix issue with boxes that do not support Auto Bitrate/Framerate.
[OnDemand] Add 4OD back in

4OD is back!

All credit to XBMC's Mossy again, top work!! The feeds don't provide as
much programme data as previously but it's enough to live with!
[TransCodeSetup] only reset bitrate/framerate if auto had been set.
Merge remote-tracking branch 'upstream/master'