Show current selection of categorical in filter dialog
Merge pull request #149 from dennishendriksen/master

Javascript Search API client + small bug fixes
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer.js
Merge pull request #151 from dennishendriksen/master

Add converters for all types in OMX2.2
Remove unused
Fix sorting
Merge pull request #152 from erwinwinder/master

Fix sorting
Gui enhancements
Merge pull request #153 from erwinwinder/master

DataExplorere gui enhancements
fixed the Json in the description field in ObservableFeature
changed the importer, will commit now in batches
Merge pull request #154 from RoanKanninga/master

changed the importer + create Json object in the description field