Cleaned .gitignore merge conflict.
Moved the models to tests/models.
Merge branch 'master' into kai-branch
added Batch and IdealFedbatch classes to bioreactor module
added a new dfba example