changed calibration and weight-parameters
Merge branch 'master' of https://github.com/Bioreactor/Code-Bioreactor