fix merge
removed DS store files
removed println
Merge branch 'master' of https://github.com/molgenis/molgenis
deleted some evil comments
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
removed @AUTOWIRED modifier from CBMToOMXConverterController constructor
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #722 from ChaoPang/master

Removed @AUTOWIRED modifier from CBMToOMXConverterController constructor. Otherwise an error throws when starting up the application