add alarm
Merge branch 'master' of https://github.com/Cangol/OneTV.git