CLSN-1258merge product config screens
CLSN-1258merge product config screens
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-1258merge product config screens