Auto correction time when conflict timers

Thanks Dima73
Add possiblity to choose for wakup in (deep) standby with zaptimers

Thanks Dima73
Merge branch 'master' of git://git.code.sf.net/p/openpli/enigma2