Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
fix tests
Merge pull request #953 from dennishendriksen/feature/studydefinitionservice

Fix tests