merge HEAD 23th of May
merge HEAD 23th of may
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge HEAD 23th May 2013
tomerge
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
OMX 2.2 model changes + generic layer catalog service improvements
Study definition plfugin
Merge pull request #348 from mdijkstra/master

Added new workflow: dynamic invitation + bug fix
to merge
Merge branch 'master' of https://github.com/molgenis/molgenis
test
Merge pull request #351 from mdijkstra/master

Fixed impute2 parameters + runid bug again
Merge branch 'master' of https://github.com/molgenis/molgenis
Refactor ResourceManagerService
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #349 from erwinwinder/master

 Study definition plugin