fix merge
Remove filemanager - is not used currently
removed DS store files
Fixed the css path. Was broken by the updated url for the plugin.
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #718 from bartcharbon/master

Remove filemanager - is not used currently
removed println
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
bugfixes cmbconverter
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