tomerge
to merge
to merge
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
changed  to
Fixed rundir path + added testNG's
Added tests
Added Las Vegas workflow
Merge pull request #352 from georgebyelas/master

impute2Bin changed impute2gridBin
Merge pull request #354 from mdijkstra/master

Added Las Vegas workflow
Merge branch 'master' of https://github.com/molgenis/molgenis
add identifier converters for study definition ids
add study definition catalog loading, refactored catalog loading
remove mock class, use mockito in tests
add and use data query service