Merge branch 'master' into feature/eln_mods

...test_scu_microscopy/ouoldiafa1atfromqcb7kvfdqu.properties

...as/webapps/openbis-v3-api-test/html/test/test-jsVSjava.js

...1/as/webapps/openbis-v3-api-test/html/test/test-search.js

...lator/dataset/search/DataSetSearchCriteriaTranslator.java

...nslator/sample/search/SampleSearchCriteriaTranslator.java

...ces/api/v3/as/dto/dataset/search/DataSetSearchCriteria.js

...urces/api/v3/as/dto/sample/search/SampleSearchCriteria.js

...translator/search/SampleSearchCriteriaTranslatorTest.java

.../v3/dto/dataset/search/AbstractDataSetSearchCriteria.java

.../v3/dto/dataset/search/DataSetChildrenSearchCriteria.java

...v3/dto/dataset/search/DataSetContainerSearchCriteria.java

...i/v3/dto/dataset/search/DataSetParentsSearchCriteria.java

...ic/asapi/v3/dto/dataset/search/DataSetSearchCriteria.java

...pi/v3/dto/sample/search/AbstractSampleSearchCriteria.java

...pi/v3/dto/sample/search/SampleChildrenSearchCriteria.java

...i/v3/dto/sample/search/SampleContainerSearchCriteria.java

...api/v3/dto/sample/search/SampleParentsSearchCriteria.java

...eric/asapi/v3/dto/sample/search/SampleSearchCriteria.java

...a/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

openbis_ng_ui/.babelrc