Added EDL support over HTSP
dvr: clean up the new cutpoint code
dvr: some fixes from kendrak24 for my changes to PR #284
htsp: bump protocol version to reflect addition of new cutpoint API
epg: persist brand/season/episode images
cosmetics
Merge remote-tracking branch 'upstream/master'