Merge branch 'master' into projects

diff --cc skyquake/plugins/composer/api/composer.js
index b9d35ad,e9e4be1..31b3a00
--- 1/skyquake/plugins/composer/api/composer.js
--- 2/skyquake/plugins/composer/api/composer.js
+++ b/skyquake/plugins/composer/api/composer.js
@@@ -556,14 -540,10 +559,15 @@@ FileManager.addFile = function(req) 
          'external-url': download_host + '/composer/upload/' + req.query['package_id'] + '/' + req.file.filename,
          'package-type': package_type,
          'package-id': package_id,
-         'package-path': package_path + '/' + req.file.filename
+         'package-path': package_path ? package_path + '/' + req.file.filename : req.file.filename
 -    }
 +    };
 +
 +    var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/package-file-add');
 +
 +    input = utils.addProjectContextToRPCPayload(req, uri, input);
 +
- 
+     var assetType = req.query['asset_type'].toUpperCase();
+     input[makeAssetTypeParamName(package_type)] = assetType;
      return new Promise(function(resolve, reject) {
          Promise.all([
              rp({

diff --cc skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
Simple merge

diff --cc skyquake/plugins/composer/src/src/components/filemanager/FileManagerSource.js
Simple merge

diff --cc skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
Simple merge