Config changed
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
Important config