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

.gitignore

...rver/jython/api/v1/impl/MasterDataRegistrationHelper.java

...ns/eln-lims-life-sciences/1/as/master-data/data-model.xls

...as/webapps/eln-lims/html/js/controllers/MainController.js

...lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

...1/as/webapps/eln-lims/html/js/util/JExcelEditorManager.js

...ins/xls-import/1/as/services/xls-import-api/entrypoint.py

...s-import/1/as/services/xls-import-api/parsers/__init__.py

...rt/1/as/services/xls-import-api/parsers/parsers_facade.py

...ices/xls-import-api/parsers/poi_to_definition/__init__.py

...services/xls-import-api/parsers/to_definition/__init__.py

...t-api/parsers/to_definition/csv_to_definition/__init__.py

...sers/to_definition/csv_to_definition/csv_to_definition.py

...rvices/xls-import-api/parsers/to_definition/definition.py

...t-api/parsers/to_definition/poi_to_definition/__init__.py

...ers/to_definition/poi_to_definition/definition_parsers.py

...pi/parsers/to_definition/poi_to_definition/poi_cleaner.py

...sers/to_definition/poi_to_definition/poi_to_definition.py

...bis/systemtest/plugin/excelimport/AbstractImportTest.java

...nbis/systemtest/plugin/excelimport/ImportFromCsvTest.java