[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!
Merge remote-tracking branch 'oea/master'