Don't generate JpaEntitySourceGen twice
fixed TupleToCategoricalValueConverterTest
Merge branch 'master' of https://github.com/molgenis/molgenis
database -> dataService to fix ValueConverterTest
Merge pull request #949 from bartcharbon/master

fix ValueConverterTest
Merge pull request #947 from erwinwinder/master

Don't generate JpaEntitySourceGen twice
Merge pull request #948 from RoanKanninga/master

fixed TupleToCategoricalValueConverterTest
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Merge pull request #950 from dennishendriksen/feature/studydefinitionservice

Fix tests
fix test for CharacteristicLoadingCacheTest
Merge pull request #951 from RoanKanninga/master

fix test for CharacteristicLoadingCacheTest
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
fix tests