Merge pull request #1305 from dennishendriksen/master

Various fixes and improvements
Merge pull request #1312 from dennishendriksen/master

Various changes and fixes
fix #1313 Data explorer download error when filter contains xref/mref/categorical
Merge branch 'master' of https://github.com/molgenis/molgenis