to merge
to merge
Merge branch 'master' of github.com:molgenis/molgenis
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
use catalog id converter class
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
add org.molgenis to componentscan to identify generated spring components in org.molgenis package
Merge pull request #334 from dennishendriksen/master

Use catalog id converter class
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
fixed the bug that query was created by default operator OR. Add operator AND between terms of the query
Generation in DB from command line
Merge pull request #336 from georgebyelas/master

tasks generation in DB from command-line
to merge
Merge branch 'master' of github.com:molgenis/molgenis
add client to config, use valuesets in client
Merge pull request #337 from dennishendriksen/master

Add catalog service client + catalog loader changes
Merge branch 'master' of https://github.com/molgenis/molgenis