remove no use code
solve conflict
Merge branch 'master' of https://github.com/healerkx/scada
changes for hpic / weather
Merge pull request #27 from luokk/master

changes on data collection