to merge
to merge
Merge branch 'master' of github.com:molgenis/molgenis
to merge
first working catalog loader implementation
Merge pull request #333 from dennishendriksen/master

First working catalog loader implementation
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #332 from erwinwinder/master

 Check if catalogue is already loaded
use catalog id converter class
Added workflow that will be created with '--create newworkflow'
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #335 from mdijkstra/master

Added workflow that will be created with '--create newworkflow'
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
Generation in DB from command line
Merge pull request #336 from georgebyelas/master

tasks generation in DB from command-line
add client to config, use valuesets in client