CLSN-737 Allocation Subpolicy screen
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Allocation/subpolicy/allocSubpolicyCtrl.js
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-737 Allocation Subpolicy screen