Merge branch 'master' into daniel-branch
Merge branch 'kai-branch'
update specification files
Add flux ratio constraints.
Merge branch 'daniel-branch'
Merge branch 'master' into kai-branch