fixed calculateComposition

Use all DispositionManufacture objects
Merge branch 'master' of https://github.com/barthnet/ibsys2.git