#850
fix test
Don't generate JpaEntitySourceGen twice
Merge branch 'master' of https://github.com/molgenis/molgenis
fix test
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
add include
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
fix tests
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice
Merge pull request #950 from dennishendriksen/feature/studydefinitionservice

Fix tests
Fix test
Merge branch 'master' of https://github.com/molgenis/molgenis
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