settlement screen - closer to finish
merge commit
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	FileUploader/AliasTextReader/CCollageFileReader.cs
	UserInterface/Allocation/viewAllocation/ViewAllocationApiController.cs