allocation and allocation service installer merged
and reset allocation
Merge branch 'master' of https://github.com/algosystech/collosys