comited to pull (cnfilting files)
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/AngularUI.csproj
	UserInterface/Scripts/_collosys/app.js
CLSN-1145 allocations tree views