removed rubbish
.
changehed host ip
updated connetion string
updated server controller
Merge branch 'dev/scada' into dev/scadaWithWebServer
* Corrected conveyor loading bug with IIS
Merge branch 'dev/scadaWithWebServer' into dev/scada