fix compiler errors
improve no aggregates message
Merge branch 'master' of https://github.com/molgenis/molgenis
fixed tests
revert restcontrollertest
Merge pull request #1258 from dennishendriksen/master

Improve no aggregates message
Merge pull request #1259 from RoanKanninga/master

fix tests
fix crudsecurityrepository in omximporterserviceimpl
Merge pull request #1261 from RoanKanninga/master

fix crudsecurityrepository in omximporterserviceimpl
Merge branch 'master' of https://github.com/molgenis/molgenis
fix bugs
fix permission in exception message
fix tests
Merge remote-tracking branch 'upstream/master'