CLSN-242 convert grid-settings two tabs to cs-fields
Merge branch 'master' of https://github.com/algosystech/collosys