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