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

...s/generic/server/plugins/standard/AggregationService.java

.../server/plugins/standard/ArchivingAggregationService.java

...dss/generic/server/plugins/standard/IngestionService.java

...ver/plugins/standard/ArchivingAggregationServiceTest.java

.../java/ch/ethz/bsse/cisd/dsu/tracking/main/TrackingBO.java

...ic/server/asapi/v3/executor/rights/GetRightsExecutor.java

...sx/cisd/openbis/generic/server/dataaccess/db/DataDAO.java

...bis/generic/server/hotfix/ELNCollectionTypeMigration.java

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

...a/ch/systemsx/cisd/openbis/public/resources/js/openbis.js

...h/ethz/sis/openbis/systemtest/asapi/v3/GetRightsTest.java

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

...ln-lims/1/as/miscellaneous/file-service/plugin.properties

...plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css

...plugins/eln-lims/1/as/webapps/eln-lims/html/etc/config.js

...re-plugins/eln-lims/1/as/webapps/eln-lims/html/index.html

.../eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js

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

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

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