Timeshift and epg

Merge jdembski Timeshift and epg branch