[Update] screen "TimerSanityConflict" added in openatv.xml
Merge pull request #62 from iPkay/master

[Update] screen "TimerSanityConflict" added in openatv.xml