Merge pull request #1158 from dennishendriksen/feature/genericdataexplorer

Fix aggregates #2271
fix filter wizard #2271
Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer