some fixes in ModelFile before merging
Merge remote-tracking branch 'origin/stoewer' into morph-develop
ScientistDir checked and fixed
Merge branch 'morph-develop' of github.com:G-Node/MorphDepot into morph-develop