commited to resolve conflict
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-582 Multiselect support while creating/using condition in Subpolicy
CLSN-1236 View Stakeholder : CustomerInfo page, back button is not working properly.
clsn 1164 : spelling changed