Merge branch 'feature/ase' of https://github.com/Mark-de-Haan/molgenis into feature/ase
Merge branch 'feature/ase' of https://github.com/Mark-de-Haan/molgenis into feature/ase
convert EntityCollectionResponse to CSV
Merge branch 'feature/ase' of https://github.com/Mark-de-Haan/molgenis into feature/ase
Merge branch 'feature/ase' of https://github.com/Mark-de-Haan/molgenis into feature/ase
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/ase
Fixed test for Mysql mref field
Merge pull request #1709 from Mark-de-Haan/feature/ase

Fixed test for Mysql mref field
Fixed inverted permission check
Fixed bug where search term rule and attribute filter rules got joined together with an 'AND' statement
Merge pull request #1710 from Mark-de-Haan/feature/ase

Fixed Bugs
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/ase
Added runtime property for annotators, standard set to false
take permissions into account for mref test
Merge pull request #1711 from Mark-de-Haan/feature/ase

Added runtime property for annotators, standard set to false
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/ase
Revert "convert EntityCollectionResponse to CSV"

This reverts commit 1858f669bddebb7a0e566102db98d388662c7158.
Merge pull request #1712 from fdlk/feature/ase

Feature/ase
Merge branch 'master' of github.com:molgenis/molgenis