Merge branch 'master' of sissource.ethz.ch:sispub/openbis

README.md

openbis_benchmark/conf/config.json

...chmark/src/main/java/ch/ethz/sis/benchmark/Benchmark.java

.../src/main/java/ch/ethz/sis/benchmark/BenchmarkConfig.java

...ava/ch/ethz/sis/benchmark/impl/GlobalSearchBenchmark.java

...c/main/java/ch/ethz/sis/benchmark/impl/ListBenchmark.java

...c/main/java/ch/ethz/sis/benchmark/impl/LoadBenchmark.java

...bis_benchmark/src/main/java/ch/ethz/sis/startup/Main.java

openbis_standard_technologies/build.gradle

...ims/1/as/webapps/eln-lims/html/js/config/ELNDictionary.js

...pps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js

...s/html/js/views/DataSetForm/widgets/DatasetViewerModel.js

...ml/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js

...lims/html/js/views/SettingsForm/SettingsFormController.js

...s/eln-lims/html/js/views/SettingsForm/SettingsFormView.js