to merge
to merge
Merge branch 'master' of github.com:molgenis/molgenis
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
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
to merge
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #337 from dennishendriksen/master

Add catalog service client + catalog loader changes
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #338 from dennishendriksen/master

Add missing schema to LifeLines app
Merge branch 'master' of https://github.com/molgenis/molgenis
New command line flags for db
Merge pull request #339 from mdijkstra/master

New command line flags for db
Added connection to LL resource manager service
uncommented lifelines module