OMX 2.2 model changes + generic layer catalog service improvements
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
add imports
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
Merge pull request #357 from dennishendriksen/master

OMX 2.2 model changes + LL GL updates (WIP)