improve closing
Merge branch 'develop' of https://github.com/FalconSoft/Data-Management-Suite into develop

Conflicts:
	Src/Data-Server/Data.Server/Program.cs