Show current selection of categorical in filter dialog
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/resources/js/dataexplorer.js
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