Conflicts:
	openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js

Conflicts:
	openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js

SSDM-5101 : V3 API: Allowing registering physical data sets via the JSON facade - add more logging and introduce "folderPath" upload servlet parameter which can be used to control which folder uploaded files are stored in

SSDM-6196 : New V3 API Sort option sortBy().fetchedFieldsScore(), java implementation + basic unitests

SSDM-4331: Implement JS part of updating. PluginCreation change to allow only one EntityKind to be specified.

SSDM-4331: Update in Java and partially tested. Script compilation check added for creation and updating

SSDM-4331: add changes in common.js which comes from Piotrs branch which I messed up. This should fix broken tests in test-delete.js

Conflicts:
	openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

Conflicts:
	openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

SSDM-5380 : V3 API: missing features for Deletions - add support for force flag in V3 confirmDeletions method (with the force flag set to true it is possible to delete data sets for which regular deletion is disallowed, still it requires special rights)

SSDM-5380 : V3 API: missing features for Deletions - add deletionDate and fix a bug where deletions could not be found by id