Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Fix test
fix test for CharacteristicLoadingCacheTest
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #951 from RoanKanninga/master

fix test for CharacteristicLoadingCacheTest
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Fix MolgenisDbSettingsTest
fix tests
Merge pull request #952 from erwinwinder/master

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

Fix tests
More test fixes
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
replace DatabaseAccessException with MolgenisDataAccessException
Merge pull request #955 from bartcharbon/master

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

Fix tests