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

LICENSE

.../dss/plugins/sync/harvester/HarvesterMaintenanceTask.java

...ns/sync/harvester/config/SynchronizationConfigReader.java

...ugins/sync/harvester/synchronizer/EntitySynchronizer.java

integration-tests/source/systemtest/testcase.py

integration-tests/test_openbis_sync.py

...ins/eln-lims-life-sciences/1/as/initialize-master-data.py

...lugins/eln-lims-life-sciences/1/as/processors/__init__.py

...-sciences/1/as/processors/openbis_duplicates_processor.py

...life-sciences/1/as/processors/vocabulary_label_handler.py

...e-sciences/1/as/search_engines/search_criteria_factory.py

...n-lims-life-sciences/1/as/search_engines/search_engine.py

...-plugins/eln-lims-life-sciences/1/as/test_files/types.xls

...lugins/eln-lims-life-sciences/1/as/utils/openbis_utils.py