Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
bugfixes cmbconverter
Merge pull request #720 from RoanKanninga/master

fix merge + added some protocolmanager code
Merge pull request #721 from bartcharbon/master

some bugfixes in the cbm converter
add WorksheetPlugin