no change...comitted to allow pull
Merge branch 'master' of https://github.com/algosystech/collosys
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-292fix permission screen
Merge branch 'master' of https://github.com/algosystech/collosys
fix permission screen
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	ColloSys.QueryBuilder.Test/ColloSys.QueryBuilder.Test.csproj
Merge branch 'master' of https://github.com/algosystech/collosys
Merge branch 'master' of https://github.com/algosystech/collosys
fix permission screen