normal server fix.
Merge branch 'master' of https://github.com/Alexnagel/webserver

Conflicts:
	Webserver/ControlServer.cs