Merge remote branch 'remotes/jdembski/add_update_timer'

diff --cc src/dvr/dvr.h
Simple merge

diff --cc src/dvr/dvr_db.c
Simple merge

diff --cc src/htsp.c
Simple merge