new changes on hpic
Merge branch 'f15' of https://github.com/healerkx/scada into f15
changes for Beijing
Merge pull request #23 from luokk/f15

F15
solve conflict agentwindow