Merge pull request #1635 from erwinwinder/master

Fix Omx2emxConverter for multiple datasets of one protocol
Merge branch 'master' of https://github.com/molgenis/molgenis