window service
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	ColloSys.Shared/ColloSys.config
	FileUploader/FileReader/FileReader.cs
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	ColloSys.Shared/ColloSys.config