Fixed calculateDisposition
Added P1,P2,P3 to components
Merge branch 'master' of https://github.com/barthnet/ibsys2.git