Implement conflict checks for EPG events
Merge branch 'master' of https://github.com/tvheadend/tvheadend