recover commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	httpserver/HttpServer.cs
	httpserver/Program.cs
	httpserver/Service.cs
	httpserverTest/HttpServerTest.cs