zhuhai
DataUploadr lastest
zhuhai
solve conflict
Merge pull request #11 from oisy/zhuhai

Zhuhai
Issue 1, Title
Commit before new charts
Chart refactor
Merge branch 'master' of https://github.com/healerkx/scada
Resolve LKK's commit
Chart refactor
Chart refactor
Range select
Some changes
Some changes about refactor
Charts refactor
Energy map
Select part of energy map
scada.about attribute change
Merge branch 'f15' of https://github.com/healerkx/scada into f15