Merge branch 'staging' into 521-adding_feature_selectors_in_ontology_search
Some refactoring (especially of the OntologySearch class).
Merge branch '521-adding_feature_selectors_in_ontology_search' into develop