Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1679 from tommydeboer/master

Added table editability to Disease Matcher
Edits made for OMX repositories in the data explorer 
edit mode are now remembered and saved

dynamic scripting allows elastic search to be updated
fix position select2 fixing the problem that the select 2 collapse of
input field.
fix dropdown for the filters UX
Merge branch 'master' of github.com:molgenis/molgenis into feature/simplified_filter_UX_2649
add comments
change name xrefsearch to xrefmrefsearch
Change the name of the jquery.molgenis.xrefsearch.js to
jquery.molgenis.xrefmrefsearch.js

For xrefs we use the mrefcontrol without the "+" and without the AND/OR,
but with an "or" label
fix style filters
cleaning code filters
Added dataservice and elastic search update functionality to OmxRepository for the following types: StringValue, TextValue, IntValue, LongValue, DecimalValue, HtmlValue, HyperlinkValue, EmailValue and DateValue
Merge pull request #1680 from Mark-de-Haan/master

Edits made for OMX repositories in the data explorer edit mode are now remembered
fixed the total number of retrieved by RestAPI for indexed ontologyterms and aggregate count
added a new field for ontology term synonyms while indexing; added RuntimeProperty for ontologyterm synonyms fields
Merge branch 'master' of https://github.com/molgenis/molgenis
added the clear message on how the matching was accomplished in the popup window
fixed the test broken by the changes in the OntologyIndexRepository and OntologyTermIndexRepository
fixed the test broken by the changes in OntologyTermIndexEntity class
Merge pull request #1682 from ChaoPang/master

Fix for ontologyindexer and indexedontologytermRepository
1. added consistent style to the filters 
2. added complex filter operator where the user can chose for (and/or)
3. added mini style to complex filter operator select button.
4. added label to xref always or.