two timer
Merge branch 'f15' of https://github.com/healerkx/scada into f15
solve conflict
correct mistake
Merge pull request #26 from oisy/f15

F15 solve pull conflict