Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1680 from Mark-de-Haan/master

Edits made for OMX repositories in the data explorer edit mode are now remembered
Increased maximum file size to 64mb instead of 32mb
Changes to OMX repository for editing of complex data types
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
add configurable maximum file size
Merge branch 'master' of https://github.com/molgenis/molgenis
add configurable maximum file size + fix no results message search tree in catalog
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1683 from bartcharbon/master

add configurable maximum file size + fix no results message catalog tree
Merge with master branch