added Count radio buttons to the permission manager
fix merge
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1247 from dennishendriksen/master

Fix categorical aggregates display name
fixing molgenis, added role to the test
fix merge 2
fix merge 3
fix merge 4
Show identifier in stead of name.
Merge branch 'master' of https://github.com/molgenis/molgenis
Show identifier in stead of name.
Merge pull request #1249 from erwinwinder/master

Show identifier instead of name
Merge pull request #1248 from RoanKanninga/master

fixing molgenis, added role to the test + formatting of PermissionManager
fix importing of categorical values
code formatting
fix the test
Merge pull request #1251 from RoanKanninga/master

fix OmxIterator test + gaf test
Fix jpa AND query
Merge pull request #1250 from bartcharbon/master

fix importing of categorical values
Merge pull request #1252 from erwinwinder/master

Fix jpa AND query