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
N42 file parse BUG
Cinderella history data upload
Merge pull request #27 from luokk/master

changes on data collection
Config changed
Missing configs
Merge branch 'master' of https://github.com/healerkx/scada

Conflicts:
	DAQ/Scada.Data.Client/AgentWindow.cs
Merge branch 'master' of https://github.com/healerkx/scada
Merge branch 'master' of https://github.com/healerkx/scada
Important config
switch province to country
Merge branch 'f15' of https://github.com/healerkx/scada into f15
switch province to country
log
log
add new device data commit