merge of cobra-devel with git/master
merge, less vonB & rBioNet
Merge http://github.com/rmtfleming/cobratoolbox into develop
Merge branch 'convertSBMLToCobra' into develop
fixed bug I introduced by renaming subSystem and confidenceScores fields in convertSBMLToCobra
fixed commit
fixed commit