Changed calculateDisposition
Added calculateFutureStock
Merge branch 'master' of https://github.com/barthnet/ibsys2.git