diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 88f3eec9edd7276bf1eb4a0389f2b709ea9e53a8..6e16f6a6e7ec6d510ceb1d4f653d75dab72e248d 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -361,7 +361,7 @@ password,password
"Shipping Amount","Shipping Amount"
"Tax Amount","Tax Amount"
"Browse Files...","Browse Files..."
-"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
"Magento ver. %1","Magento ver. %1"
"Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
"Account Setting","Account Setting"
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
index 41781c9d1287fcbabaca8e259939424f85697bb7..ed23e4ab320b17a56b0cc616423968af372b4df5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -8,4 +8,4 @@
?>
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright © %1 Magento. All rights reserved.', date('Y')) ?>
+<?php /* @escapeNotVerified */ echo __('Copyright© %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
index deed36f3e576ba8af26f3203ebb3683d4638fa5c..e1e146c761848a17122f25d9fd7dfd2ad02ade1f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
@@ -63,13 +63,13 @@ class Grid
$gridTableName = $this->flatScopeResolver->resolve(Customer::CUSTOMER_GRID_INDEXER_ID, []);
$select = $connection->select()
- ->from($connection->getTableName($gridTableName), 'last_visit_at')
+ ->from($this->resource->getTableName($gridTableName), 'last_visit_at')
->order('last_visit_at DESC')
->limit(1);
$lastVisitAt = $connection->query($select)->fetchColumn();
$select = $connection->select()
- ->from($connection->getTableName('customer_log'), 'customer_id')
+ ->from($this->resource->getTableName('customer_log'), 'customer_id')
->where('last_login_at > ?', $lastVisitAt);
$customerIds = [];
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
index feaf248f233fed187703debc236d69e4d696d821..b71bb01681569a71d48226f3e98c248324db0f5d 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
@@ -21,7 +21,7 @@ class InfoTest extends \PHPUnit_Framework_TestCase
const CHANGE_PASSWORD_URL = 'http://localhost/index.php/account/edit/changepass/1';
- const EMAIL_ADDRESS = 'john.doe@ebay.com';
+ const EMAIL_ADDRESS = 'john.doe@example.com';
/** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\View\Element\Template\Context */
private $_context;
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php
index 66f925fa08ee905d984f14a9653eb5d617c77dd2..92a4f5612de860acbe77a2e0b702b2262f2b3860 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Customer/GridTest.php
@@ -90,7 +90,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
->with(\Magento\Customer\Model\Customer::CUSTOMER_GRID_INDEXER_ID, [])
->willReturn($gridTable);
- $this->connection->expects($this->exactly(2))
+ $this->resource->expects($this->exactly(2))
->method('getTableName')
->willReturnMap([
[$gridTable],
diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
index cd8dfd48f2152ccd2a8471f13faf986b6fafa114..b5c1fbf2fae3e9b327e87acadc93235f08dcc650 100644
--- a/app/code/Magento/Sales/etc/fieldset.xml
+++ b/app/code/Magento/Sales/etc/fieldset.xml
@@ -508,7 +508,6 @@
</field>
<field name="base_shipping_amount">
<aspect name="to_quote_address_shipping" />
- <aspect name="to_cm"/>
</field>
<field name="base_shipping_incl_tax">
<aspect name="to_quote_address_shipping" />
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 1bde25b44a4fd95346b4cdd3b69e57f6243ec2e8..e2c5051a5b79b6c904f474ecd6c96afb53d30a6c 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -1152,11 +1152,22 @@ define([
jQuery('#edit_form').triggerHandler('save');
}
if (this.orderItemChanged) {
- if (confirm('You have item changes')) {
- disableAndSave();
- } else {
- this.itemsUpdate();
- }
+ var self = this;
+
+ jQuery('#edit_form').trigger('processStop');
+
+ confirm({
+ content: jQuery.mage.__('You have item changes'),
+ actions: {
+ confirm: function() {
+ jQuery('#edit_form').trigger('processStart');
+ disableAndSave();
+ },
+ cancel: function() {
+ self.itemsUpdate();
+ }
+ }
+ });
} else {
disableAndSave();
}
diff --git a/app/code/Magento/Ui/Setup/InstallSchema.php b/app/code/Magento/Ui/Setup/InstallSchema.php
index 332993f42c754f3d1d46ed2b120969d9f1b5d6ce..2c6b0ce484d152cfad58dfce2b4cad90492aa290 100644
--- a/app/code/Magento/Ui/Setup/InstallSchema.php
+++ b/app/code/Magento/Ui/Setup/InstallSchema.php
@@ -80,7 +80,7 @@ class InstallSchema implements InstallSchemaInterface
->addForeignKey(
$setup->getFkName('ui_bookmark', 'user_id', 'admin_user', 'user_id'),
'user_id',
- 'admin_user',
+ $setup->getTable('admin_user'),
'user_id',
Table::ACTION_CASCADE
)
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 22380080d521e63db31deba2254c9cc47b078a9f..db29f1e48d41436faa438b7268a41e2adb0d1283 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -6,7 +6,8 @@
"magento/module-backend": "100.0.*",
"magento/framework": "100.0.*",
"magento/module-eav": "100.0.*",
- "magento/module-authorization": "100.0.*"
+ "magento/module-authorization": "100.0.*",
+ "magento/module-user": "100.0.*"
},
"type": "magento2-module",
"version": "100.0.1",
diff --git a/app/design/frontend/Magento/blank/web/images/logo.svg b/app/design/frontend/Magento/blank/web/images/logo.svg
index 0bcad31bf5851171cc17af639290104387bcfbf9..013d6e7c5a107868c21cbf21d5bc42da9323667d 100644
--- a/app/design/frontend/Magento/blank/web/images/logo.svg
+++ b/app/design/frontend/Magento/blank/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="189" height="64" viewBox="0 0 189 64"><path d="M23.333 0L0 14.135V41l6.06 3.568V17.703L23.338 7.2 40.63 17.686l.074.042-.008 26.798 6-3.528V14.135L23.334 0zm3.088 16.538v31.408l-3.084 1.888-3.09-1.896V16.562L12.24 21.49v26.86l11.093 6.79 11.19-6.838v-26.83L26.42 16.54z" fill="#ED7402"/><path d="M12.24 21.49l8.002 4.887v-9.814L12.24 21.49zm14.18-4.952v9.902l8.102-4.967-8.1-4.935zm20.277-2.403L23.333 0 0 14.135l6.06 3.568L23.338 7.2l17.365 10.53 5.994-3.595z" fill="#F8B97F"/><path d="M82.328 39.984l-1.608-20.54-8.156 20.65h-2.656l-8.156-20.65-1.57 20.54h-3.294l2.058-25.814h4.34l8.043 21.174 8.04-21.174h4.3l2.02 25.814h-3.366zm17.582 0l-.375-2.395c-1.42 1.454-3.366 2.764-6.284 2.764-3.214 0-5.233-1.945-5.233-4.976 0-4.45 3.815-6.21 11.26-6.996v-.748c0-2.244-1.346-3.03-3.405-3.03-2.17 0-4.227.673-6.172 1.533l-.45-2.88c2.134-.86 4.154-1.497 6.923-1.497 4.34 0 6.436 1.757 6.436 5.723V39.98h-2.7zm-.635-9.055c-6.586.632-7.97 2.43-7.97 4.262 0 1.458.973 2.394 2.657 2.394 1.945 0 3.816-.975 5.312-2.51v-4.15zm22.445-9.056l.486 2.992-3.404.336c.486.824.71 1.76.71 2.77 0 3.816-3.217 6.134-6.846 6.134-.45 0-.9-.037-1.347-.112-.528.338-.9.75-.9 1.085 0 .637.632.79 3.775 1.35l1.273.223c3.78.672 6.135 1.87 6.135 4.638 0 3.743-4.078 5.5-8.716 5.5-4.64 0-8.343-1.456-8.343-4.6 0-1.832 1.27-3.254 3.777-4.6-.783-.562-1.12-1.2-1.12-1.872 0-.86.67-1.724 1.87-2.434-1.982-.973-3.33-2.88-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.794 0 3.367.522 4.602 1.496l4.527-1.384zm-13.99 20.052c0 1.423 1.832 2.47 5.31 2.47 3.48 0 5.425-1.197 5.425-2.693 0-1.086-.822-1.832-3.366-2.282l-2.137-.374c-.972-.186-1.495-.3-2.207-.448-2.095 1.045-3.03 2.094-3.03 3.327zm4.862-17.733c-2.244 0-3.63 1.722-3.63 3.89 0 2.06 1.422 3.666 3.63 3.666 2.283 0 3.704-1.68 3.704-3.814 0-2.132-1.496-3.74-3.704-3.74zm24.99 7.22H125.46c.113 4.15 2.094 6.1 5.2 6.1 2.584 0 4.454-1.01 6.398-2.545l.485 2.993c-1.907 1.498-4.188 2.395-7.143 2.395-4.64 0-8.27-2.807-8.27-9.354 0-5.723 3.368-9.24 7.856-9.24 5.2 0 7.595 4.004 7.595 8.94.006.19.006.487.006.713zm-7.63-7.032c-2.06 0-3.817 1.46-4.34 4.527h8.604c-.41-2.883-1.682-4.528-4.264-4.528zm21.658 15.6V27.82c0-1.83-.785-3.065-2.73-3.065-1.758 0-3.554 1.16-5.162 2.88v12.347h-3.33V22.138h2.656l.412 2.582c1.683-1.533 3.78-2.955 6.322-2.955 3.368 0 5.165 2.02 5.165 5.236v12.987h-3.332zm13.17.3c-3.143 0-5.2-1.122-5.2-4.714V24.944h-2.694v-2.806h2.694v-5.95l3.255-.484v6.434h3.853l.45 2.806h-4.303V34.97c0 1.46.6 2.356 2.47 2.356.597 0 1.12-.035 1.53-.112l.45 2.843c-.56.112-1.345.227-2.506.227zm11.036.075c-4.75 0-8.194-3.403-8.194-9.278s3.443-9.316 8.194-9.316c4.788 0 8.305 3.44 8.305 9.315 0 5.874-3.513 9.277-8.3 9.277zm0-15.788c-3.217 0-4.826 2.767-4.826 6.51 0 3.666 1.683 6.51 4.826 6.51 3.292 0 4.938-2.77 4.938-6.51 0-3.668-1.72-6.51-4.938-6.51zm10.664.24c-1.34 0-2.27-.93-2.27-2.318 0-1.38.95-2.33 2.27-2.33 1.338 0 2.268.94 2.268 2.33 0 1.377-.95 2.317-2.27 2.317zm0-4.376c-1.08 0-1.94.74-1.94 2.06 0 1.31.86 2.05 1.94 2.05 1.09 0 1.948-.74 1.948-2.05 0-1.32-.87-2.06-1.95-2.06zm.667 3.298l-.768-1.098h-.25v1.06h-.44v-2.57h.78c.54 0 .894.27.894.75 0 .37-.2.61-.52.71l.74 1.05-.44.1zm-.677-2.208h-.34v.76h.32c.29 0 .47-.12.47-.38 0-.25-.16-.38-.45-.38z" fill="#131108"/><g fill="#6F6456"><circle cx="97.069" cy="51.783" r=".484"/><path d="M96.72 58.903v-5.31h.697v5.31zm6.247 0v-3.18c0-.624-.163-1.08-.49-1.36-.327-.28-.747-.42-1.26-.42-.28 0-.554.043-.814.13-.258.09-.488.226-.686.413-.197.187-.352.422-.47.708-.114.284-.172.624-.172 1.02v2.69h-.697V54.83c0-.056-.002-.14-.005-.253-.002-.112-.007-.23-.01-.353-.005-.125-.008-.244-.01-.36-.004-.115-.006-.205-.006-.27h.665l.042 1.15c.05-.12.13-.254.238-.405.108-.155.257-.298.443-.43.186-.135.41-.248.668-.34.26-.09.563-.136.908-.136.72 0 1.29.184 1.72.55.425.366.64.938.64 1.72v3.2h-.7zm6.1-.318c-.466.318-1.107.476-1.922.476-.47 0-.888-.06-1.254-.185-.36-.127-.67-.313-.92-.557-.254-.242-.446-.537-.576-.88-.13-.345-.193-.735-.193-1.172 0-.436.07-.828.213-1.175.146-.35.35-.646.613-.893.262-.246.58-.434.953-.564.37-.13.785-.195 1.242-.195.346 0 .667.038.965.11.3.074.564.185.794.334.23.148.426.336.58.565.154.23.26.498.315.808h-.74c-.08-.422-.29-.745-.62-.97-.33-.226-.756-.338-1.277-.338-.324 0-.625.05-.903.154-.277.1-.52.25-.728.448s-.37.44-.49.73c-.12.288-.18.614-.18.98 0 .345.05.658.148.94.098.28.243.522.432.722.19.2.426.356.706.47.284.11.6.167.96.167.585 0 1.044-.112 1.38-.338.333-.227.538-.546.616-.96h.737c-.096.57-.38 1.01-.846 1.33zm-22.947-2.18c-1.096.034-1.775.232-1.775.953 0 .466.372.97 1.316.97 1.27 0 1.94-.69 1.94-1.82v-.124c-.44 0-.99.005-1.48.02zm2.688 1.494c0 .35.01.694.04 1.01h-1.12c-.03-.26-.042-.517-.042-.765-.606.748-1.327.962-2.328.962-1.484 0-2.28-.787-2.28-1.694 0-1.315 1.082-1.778 2.96-1.82.512-.012 1.087-.014 1.564-.014v-.13c0-.88-.563-1.24-1.542-1.24-.726 0-1.26.3-1.317.82h-1.266c.134-1.296 1.494-1.623 2.69-1.623 1.43 0 2.64.51 2.64 2.025V57.9zm-13.12-2.14c-.047-1.127-.86-1.55-1.73-1.55-.94 0-1.69.476-1.82 1.55h3.55zm-3.577.803c.07 1.094.82 1.74 1.86 1.74.72 0 1.36-.29 1.576-.928h1.242c-.24 1.294-1.615 1.733-2.798 1.733-2.15 0-3.105-1.188-3.105-2.784 0-1.758.987-2.917 3.124-2.917 1.7 0 2.946.89 2.946 2.833v.32H72.11zm7.94 1.72c1.12 0 1.887-.808 1.887-2.024 0-1.218-.767-2.024-1.887-2.024-1.117 0-1.89.806-1.89 2.025 0 1.218.774 2.026 1.89 2.026zm-3.094-6.995h1.205v3.03c.59-.706 1.405-.91 2.206-.91 1.344 0 2.836.906 2.836 2.864 0 1.64-1.185 2.835-2.856 2.835-.875 0-1.7-.314-2.208-.938 0 .247-.013.5-.04.736H76.91c.02-.385.04-.863.04-1.248V51.29zm18 2.32l-3.73 7.325h-1.35L90.95 58.9l-2.813-5.29h1.413l2.065 4.132 2.06-4.132h1.278zm15.16 0h.1v.138h.155v.07h-.156v.297c0 .054.017.084.08.084.02 0 .05 0 .077-.006v.07c-.03.005-.062.007-.095.007-.1 0-.16-.032-.16-.15v-.303h-.135v-.07h.133v-.136zm.39.254c0-.04-.003-.076-.005-.117h.093c0 .026.004.055.004.09.063-.077.135-.11.22-.11.087 0 .158.043.19.13.037-.072.115-.13.212-.13.144 0 .236.07.236.24v.297h-.1v-.26c0-.125-.04-.208-.147-.208-.09 0-.18.06-.18.23v.237h-.1V54c0-.138-.05-.2-.143-.2-.088 0-.186.063-.186.215v.25h-.1v-.4z"/></g><path d="M60.653 58.874l-.104-.67c-.4.408-.945.774-1.76.774-.9 0-1.466-.544-1.466-1.392 0-1.245 1.067-1.736 3.15-1.956v-.21c0-.626-.377-.846-.953-.846-.606 0-1.18.188-1.725.43l-.126-.806c.597-.24 1.162-.42 1.936-.42 1.213 0 1.8.493 1.8 1.602v3.494h-.755zm-.178-2.533c-1.84.18-2.228.68-2.228 1.197 0 .408.272.67.743.67.543 0 1.067-.273 1.485-.702v-1.16zm5.445 2.536v-3.4c0-.513-.22-.858-.762-.858-.492 0-.994.324-1.443.805v3.455h-.932v-4.99h.744l.114.72c.476-.428 1.06-.826 1.77-.826.94 0 1.447.565 1.447 1.465v3.63h-.933zm51.346.038c-1.34 0-2.323-.93-2.323-2.595 0-1.707 1.047-2.606 2.343-2.606.733 0 1.256.19 1.632.46l-.136.91c-.46-.376-.93-.555-1.506-.555-.816 0-1.39.616-1.39 1.78 0 1.21.616 1.787 1.495 1.787.506 0 .945-.115 1.458-.555l.136.84c-.512.388-1.034.535-1.704.535zm4.74 0c-1.33 0-2.292-.952-2.292-2.595 0-1.643.962-2.606 2.292-2.606 1.338 0 2.32.963 2.32 2.605s-.982 2.594-2.32 2.594zm0-4.415c-.9 0-1.35.773-1.35 1.82 0 1.024.47 1.82 1.35 1.82.92 0 1.38-.774 1.38-1.82 0-1.026-.48-1.82-1.38-1.82zm9.606 4.31v-3.4c0-.514-.188-.86-.732-.86-.492 0-.962.325-1.412.806v3.453h-.932v-3.4c0-.514-.188-.86-.732-.86-.49 0-.962.325-1.413.806v3.453h-.93v-4.99h.746l.115.72c.47-.43 1.035-.826 1.736-.826.733 0 1.13.314 1.32.827.45-.43 1.055-.826 1.756-.826.955 0 1.415.565 1.415 1.465v3.63h-.93zm4.508.06c-.492 0-.942-.092-1.257-.22v1.968l-.93.136v-6.936h.742l.115.722c.376-.44.89-.83 1.622-.83 1.077 0 1.967.795 1.967 2.46 0 1.82-1.05 2.7-2.26 2.7zm.146-4.33c-.565 0-1.004.346-1.402.88v2.396c.377.188.68.27 1.214.27.784 0 1.36-.637 1.36-1.87 0-1.09-.493-1.675-1.172-1.675zm6.234 4.27l-.106-.67c-.397.407-.94.774-1.757.774-.9 0-1.465-.544-1.465-1.392 0-1.242 1.067-1.733 3.15-1.954v-.21c0-.626-.378-.846-.954-.846-.606 0-1.182.187-1.726.43l-.125-.808c.596-.24 1.16-.417 1.935-.417 1.214 0 1.8.492 1.8 1.6v3.495h-.753zm-.18-2.533c-1.84.177-2.227.68-2.227 1.193 0 .405.27.666.742.666.545 0 1.067-.272 1.486-.7v-1.162zm5.448 2.532v-3.4c0-.514-.22-.86-.764-.86-.492 0-.993.325-1.443.806v3.453h-.93v-4.99h.745l.115.72c.47-.43 1.056-.826 1.767-.826.942 0 1.444.565 1.444 1.465v3.63h-.93zm4.232.44c-.43 1.16-.962 1.463-1.79 1.463-.124 0-.23-.02-.323-.042l-.126-.815c.16.042.35.073.527.073.388 0 .648-.188.795-.586l.188-.51-1.82-4.94.92-.144 1.36 3.975 1.328-3.902h.952L152 59.25z" fill="#6F6456"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php
index bf42f3fba147321bb4b4cc34be562638f04c8d79..ad49d7c6d139fc81cfffba1f3ecbe7dc963c28d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/BillingAddressManagementTest.php
@@ -104,7 +104,7 @@ class BillingAddressManagementTest extends WebapiAbstract
'firstname' => 'John',
'lastname' => 'Smith',
'email' => '',
- 'company' => 'eBay Inc',
+ 'company' => 'Magento Commerce Inc.',
'street' => ['Typical Street', 'Tiny House 18'],
'city' => 'Big City',
'region_id' => 12,
@@ -227,7 +227,7 @@ class BillingAddressManagementTest extends WebapiAbstract
$addressData = [
'firstname' => 'John',
'lastname' => 'Smith',
- 'company' => 'eBay Inc',
+ 'company' => 'Magento Commerce Inc.',
'street' => ['Typical Street', 'Tiny House 18'],
'city' => 'Big City',
'region_id' => 12,
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php
index 554b6728a02a6885a1cef6359a266dc3a3b1e5de..d130fd09c44db1ba52434feeeed89820ba3416d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestBillingAddressManagementTest.php
@@ -113,7 +113,7 @@ class GuestBillingAddressManagementTest extends WebapiAbstract
'firstname' => 'John',
'lastname' => 'Smith',
'email' => '',
- 'company' => 'eBay Inc',
+ 'company' => 'Magento Commerce Inc.',
'street' => ['Typical Street', 'Tiny House 18'],
'city' => 'Big City',
'region_id' => 12,
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml
index 3bfd4dbe8829cbf67e3c6107428b66eda425033b..1aa8490499e8761c3d5175e3e33f7e4464585bb3 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Repository/UrlRewrite.xml
@@ -9,7 +9,7 @@
<repository class="Magento\UrlRewrite\Test\Repository\UrlRewrite">
<dataset name="default">
<field name="request_path" xsi:type="string">test-test-test%isolation%.html</field>
- <field name="target_path" xsi:type="string">http://www.ebayinc.com/</field>
+ <field name="target_path" xsi:type="string">http://www.example.com/</field>
<field name="redirect_type" xsi:type="string">Temporary (302)</field>
<field name="store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</field>
</dataset>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
index f1a3573f3b05409cbd691b3e3fe13f6732f2cdd9..f83d74d3bc27313b71317568e006cbe41e41d32f 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AddressTest.php
@@ -70,7 +70,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
'form_key' => $this->_objectManager->get('Magento\Framework\Data\Form\FormKey')->getFormKey(),
'firstname' => 'James',
'lastname' => 'Bond',
- 'company' => 'Ebay',
+ 'company' => 'Magento Commerce Inc.',
'telephone' => '1112223333',
'fax' => '2223334444',
'street' => ['1234 Monterey Rd', 'Apt 13'],
@@ -117,7 +117,7 @@ class AddressTest extends \Magento\TestFramework\TestCase\AbstractController
'form_key' => $this->_objectManager->get('Magento\Framework\Data\Form\FormKey')->getFormKey(),
'firstname' => 'James',
'lastname' => 'Bond',
- 'company' => 'Ebay',
+ 'company' => 'Magento Commerce Inc.',
'telephone' => '1112223333',
'fax' => '2223334444',
// omit street and city to fail validation
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php
index b60b036b0210d8b94a3b91dbf003d4a281f5dc3d..8045e90f2ee7351856f2266bf88b661dc4e29b12 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/FormFactoryTest.php
@@ -21,7 +21,7 @@ class FormFactoryTest extends \PHPUnit_Framework_TestCase
'id' => 13,
'default_shipping' => true,
'default_billing' => false,
- 'company' => 'eBay Inc.',
+ 'company' => 'Magento Commerce Inc.',
'middlename' => 'MiddleName',
'prefix' => 'Mr.',
'suffix' => 'Esq.',
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..cae5cefda57928ea69efd39dea74244a90d282c4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Convert/OrderTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Model\Convert;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class OrderTest
+ */
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var Order */
+ protected $_model;
+
+ protected function setUp()
+ {
+ $this->_model = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Convert\Order');
+ }
+
+ /**
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+ public function testConvertToCreditmemo()
+ {
+ /** @var \Magento\Sales\Model\Order $order */
+ $order = Bootstrap::getObjectManager()->create('Magento\Sales\Model\Order');
+ $order->loadByIncrementId('100000001');
+ //MAGETWO-45612 fix
+ $order->setBaseShippingAmount(5);
+ $this->assertNull($this->_model->toCreditmemo($order)->getBaseShippingAmount());
+ }
+}
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
index a85c323f0cc228488918f9da07a41886bb4acf73..49c78595c33dc18e014a090df1bee11e8f4ee9eb 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
@@ -48,7 +48,7 @@ class FieldsFilterTest extends \PHPUnit_Framework_TestCase
],
'firstname' => 'Jane',
'lastname' => 'Doe',
- 'email' => 'jdoe@ebay.com',
+ 'email' => 'jdoe@example.com',
'default_billing' => '1',
'default_shipping' => '1',
'created_at' => '2014-05-27 18:59:43',
@@ -134,7 +134,7 @@ class FieldsFilterTest extends \PHPUnit_Framework_TestCase
$expected = [
'customer' => [
'id' => '1',
- 'email' => 'jdoe@ebay.com',
+ 'email' => 'jdoe@example.com',
],
'addresses' => [
0 => [
@@ -170,7 +170,7 @@ class FieldsFilterTest extends \PHPUnit_Framework_TestCase
$expected = [
'customer' => [
'id' => '1',
- 'email' => 'jdoe@ebay.com',
+ 'email' => 'jdoe@example.com',
],
'addresses' => [
0 => [
diff --git a/lib/web/images/logo.svg b/lib/web/images/logo.svg
index 0bcad31bf5851171cc17af639290104387bcfbf9..013d6e7c5a107868c21cbf21d5bc42da9323667d 100644
--- a/lib/web/images/logo.svg
+++ b/lib/web/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="189" height="64" viewBox="0 0 189 64"><path d="M23.333 0L0 14.135V41l6.06 3.568V17.703L23.338 7.2 40.63 17.686l.074.042-.008 26.798 6-3.528V14.135L23.334 0zm3.088 16.538v31.408l-3.084 1.888-3.09-1.896V16.562L12.24 21.49v26.86l11.093 6.79 11.19-6.838v-26.83L26.42 16.54z" fill="#ED7402"/><path d="M12.24 21.49l8.002 4.887v-9.814L12.24 21.49zm14.18-4.952v9.902l8.102-4.967-8.1-4.935zm20.277-2.403L23.333 0 0 14.135l6.06 3.568L23.338 7.2l17.365 10.53 5.994-3.595z" fill="#F8B97F"/><path d="M82.328 39.984l-1.608-20.54-8.156 20.65h-2.656l-8.156-20.65-1.57 20.54h-3.294l2.058-25.814h4.34l8.043 21.174 8.04-21.174h4.3l2.02 25.814h-3.366zm17.582 0l-.375-2.395c-1.42 1.454-3.366 2.764-6.284 2.764-3.214 0-5.233-1.945-5.233-4.976 0-4.45 3.815-6.21 11.26-6.996v-.748c0-2.244-1.346-3.03-3.405-3.03-2.17 0-4.227.673-6.172 1.533l-.45-2.88c2.134-.86 4.154-1.497 6.923-1.497 4.34 0 6.436 1.757 6.436 5.723V39.98h-2.7zm-.635-9.055c-6.586.632-7.97 2.43-7.97 4.262 0 1.458.973 2.394 2.657 2.394 1.945 0 3.816-.975 5.312-2.51v-4.15zm22.445-9.056l.486 2.992-3.404.336c.486.824.71 1.76.71 2.77 0 3.816-3.217 6.134-6.846 6.134-.45 0-.9-.037-1.347-.112-.528.338-.9.75-.9 1.085 0 .637.632.79 3.775 1.35l1.273.223c3.78.672 6.135 1.87 6.135 4.638 0 3.743-4.078 5.5-8.716 5.5-4.64 0-8.343-1.456-8.343-4.6 0-1.832 1.27-3.254 3.777-4.6-.783-.562-1.12-1.2-1.12-1.872 0-.86.67-1.724 1.87-2.434-1.982-.973-3.33-2.88-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.794 0 3.367.522 4.602 1.496l4.527-1.384zm-13.99 20.052c0 1.423 1.832 2.47 5.31 2.47 3.48 0 5.425-1.197 5.425-2.693 0-1.086-.822-1.832-3.366-2.282l-2.137-.374c-.972-.186-1.495-.3-2.207-.448-2.095 1.045-3.03 2.094-3.03 3.327zm4.862-17.733c-2.244 0-3.63 1.722-3.63 3.89 0 2.06 1.422 3.666 3.63 3.666 2.283 0 3.704-1.68 3.704-3.814 0-2.132-1.496-3.74-3.704-3.74zm24.99 7.22H125.46c.113 4.15 2.094 6.1 5.2 6.1 2.584 0 4.454-1.01 6.398-2.545l.485 2.993c-1.907 1.498-4.188 2.395-7.143 2.395-4.64 0-8.27-2.807-8.27-9.354 0-5.723 3.368-9.24 7.856-9.24 5.2 0 7.595 4.004 7.595 8.94.006.19.006.487.006.713zm-7.63-7.032c-2.06 0-3.817 1.46-4.34 4.527h8.604c-.41-2.883-1.682-4.528-4.264-4.528zm21.658 15.6V27.82c0-1.83-.785-3.065-2.73-3.065-1.758 0-3.554 1.16-5.162 2.88v12.347h-3.33V22.138h2.656l.412 2.582c1.683-1.533 3.78-2.955 6.322-2.955 3.368 0 5.165 2.02 5.165 5.236v12.987h-3.332zm13.17.3c-3.143 0-5.2-1.122-5.2-4.714V24.944h-2.694v-2.806h2.694v-5.95l3.255-.484v6.434h3.853l.45 2.806h-4.303V34.97c0 1.46.6 2.356 2.47 2.356.597 0 1.12-.035 1.53-.112l.45 2.843c-.56.112-1.345.227-2.506.227zm11.036.075c-4.75 0-8.194-3.403-8.194-9.278s3.443-9.316 8.194-9.316c4.788 0 8.305 3.44 8.305 9.315 0 5.874-3.513 9.277-8.3 9.277zm0-15.788c-3.217 0-4.826 2.767-4.826 6.51 0 3.666 1.683 6.51 4.826 6.51 3.292 0 4.938-2.77 4.938-6.51 0-3.668-1.72-6.51-4.938-6.51zm10.664.24c-1.34 0-2.27-.93-2.27-2.318 0-1.38.95-2.33 2.27-2.33 1.338 0 2.268.94 2.268 2.33 0 1.377-.95 2.317-2.27 2.317zm0-4.376c-1.08 0-1.94.74-1.94 2.06 0 1.31.86 2.05 1.94 2.05 1.09 0 1.948-.74 1.948-2.05 0-1.32-.87-2.06-1.95-2.06zm.667 3.298l-.768-1.098h-.25v1.06h-.44v-2.57h.78c.54 0 .894.27.894.75 0 .37-.2.61-.52.71l.74 1.05-.44.1zm-.677-2.208h-.34v.76h.32c.29 0 .47-.12.47-.38 0-.25-.16-.38-.45-.38z" fill="#131108"/><g fill="#6F6456"><circle cx="97.069" cy="51.783" r=".484"/><path d="M96.72 58.903v-5.31h.697v5.31zm6.247 0v-3.18c0-.624-.163-1.08-.49-1.36-.327-.28-.747-.42-1.26-.42-.28 0-.554.043-.814.13-.258.09-.488.226-.686.413-.197.187-.352.422-.47.708-.114.284-.172.624-.172 1.02v2.69h-.697V54.83c0-.056-.002-.14-.005-.253-.002-.112-.007-.23-.01-.353-.005-.125-.008-.244-.01-.36-.004-.115-.006-.205-.006-.27h.665l.042 1.15c.05-.12.13-.254.238-.405.108-.155.257-.298.443-.43.186-.135.41-.248.668-.34.26-.09.563-.136.908-.136.72 0 1.29.184 1.72.55.425.366.64.938.64 1.72v3.2h-.7zm6.1-.318c-.466.318-1.107.476-1.922.476-.47 0-.888-.06-1.254-.185-.36-.127-.67-.313-.92-.557-.254-.242-.446-.537-.576-.88-.13-.345-.193-.735-.193-1.172 0-.436.07-.828.213-1.175.146-.35.35-.646.613-.893.262-.246.58-.434.953-.564.37-.13.785-.195 1.242-.195.346 0 .667.038.965.11.3.074.564.185.794.334.23.148.426.336.58.565.154.23.26.498.315.808h-.74c-.08-.422-.29-.745-.62-.97-.33-.226-.756-.338-1.277-.338-.324 0-.625.05-.903.154-.277.1-.52.25-.728.448s-.37.44-.49.73c-.12.288-.18.614-.18.98 0 .345.05.658.148.94.098.28.243.522.432.722.19.2.426.356.706.47.284.11.6.167.96.167.585 0 1.044-.112 1.38-.338.333-.227.538-.546.616-.96h.737c-.096.57-.38 1.01-.846 1.33zm-22.947-2.18c-1.096.034-1.775.232-1.775.953 0 .466.372.97 1.316.97 1.27 0 1.94-.69 1.94-1.82v-.124c-.44 0-.99.005-1.48.02zm2.688 1.494c0 .35.01.694.04 1.01h-1.12c-.03-.26-.042-.517-.042-.765-.606.748-1.327.962-2.328.962-1.484 0-2.28-.787-2.28-1.694 0-1.315 1.082-1.778 2.96-1.82.512-.012 1.087-.014 1.564-.014v-.13c0-.88-.563-1.24-1.542-1.24-.726 0-1.26.3-1.317.82h-1.266c.134-1.296 1.494-1.623 2.69-1.623 1.43 0 2.64.51 2.64 2.025V57.9zm-13.12-2.14c-.047-1.127-.86-1.55-1.73-1.55-.94 0-1.69.476-1.82 1.55h3.55zm-3.577.803c.07 1.094.82 1.74 1.86 1.74.72 0 1.36-.29 1.576-.928h1.242c-.24 1.294-1.615 1.733-2.798 1.733-2.15 0-3.105-1.188-3.105-2.784 0-1.758.987-2.917 3.124-2.917 1.7 0 2.946.89 2.946 2.833v.32H72.11zm7.94 1.72c1.12 0 1.887-.808 1.887-2.024 0-1.218-.767-2.024-1.887-2.024-1.117 0-1.89.806-1.89 2.025 0 1.218.774 2.026 1.89 2.026zm-3.094-6.995h1.205v3.03c.59-.706 1.405-.91 2.206-.91 1.344 0 2.836.906 2.836 2.864 0 1.64-1.185 2.835-2.856 2.835-.875 0-1.7-.314-2.208-.938 0 .247-.013.5-.04.736H76.91c.02-.385.04-.863.04-1.248V51.29zm18 2.32l-3.73 7.325h-1.35L90.95 58.9l-2.813-5.29h1.413l2.065 4.132 2.06-4.132h1.278zm15.16 0h.1v.138h.155v.07h-.156v.297c0 .054.017.084.08.084.02 0 .05 0 .077-.006v.07c-.03.005-.062.007-.095.007-.1 0-.16-.032-.16-.15v-.303h-.135v-.07h.133v-.136zm.39.254c0-.04-.003-.076-.005-.117h.093c0 .026.004.055.004.09.063-.077.135-.11.22-.11.087 0 .158.043.19.13.037-.072.115-.13.212-.13.144 0 .236.07.236.24v.297h-.1v-.26c0-.125-.04-.208-.147-.208-.09 0-.18.06-.18.23v.237h-.1V54c0-.138-.05-.2-.143-.2-.088 0-.186.063-.186.215v.25h-.1v-.4z"/></g><path d="M60.653 58.874l-.104-.67c-.4.408-.945.774-1.76.774-.9 0-1.466-.544-1.466-1.392 0-1.245 1.067-1.736 3.15-1.956v-.21c0-.626-.377-.846-.953-.846-.606 0-1.18.188-1.725.43l-.126-.806c.597-.24 1.162-.42 1.936-.42 1.213 0 1.8.493 1.8 1.602v3.494h-.755zm-.178-2.533c-1.84.18-2.228.68-2.228 1.197 0 .408.272.67.743.67.543 0 1.067-.273 1.485-.702v-1.16zm5.445 2.536v-3.4c0-.513-.22-.858-.762-.858-.492 0-.994.324-1.443.805v3.455h-.932v-4.99h.744l.114.72c.476-.428 1.06-.826 1.77-.826.94 0 1.447.565 1.447 1.465v3.63h-.933zm51.346.038c-1.34 0-2.323-.93-2.323-2.595 0-1.707 1.047-2.606 2.343-2.606.733 0 1.256.19 1.632.46l-.136.91c-.46-.376-.93-.555-1.506-.555-.816 0-1.39.616-1.39 1.78 0 1.21.616 1.787 1.495 1.787.506 0 .945-.115 1.458-.555l.136.84c-.512.388-1.034.535-1.704.535zm4.74 0c-1.33 0-2.292-.952-2.292-2.595 0-1.643.962-2.606 2.292-2.606 1.338 0 2.32.963 2.32 2.605s-.982 2.594-2.32 2.594zm0-4.415c-.9 0-1.35.773-1.35 1.82 0 1.024.47 1.82 1.35 1.82.92 0 1.38-.774 1.38-1.82 0-1.026-.48-1.82-1.38-1.82zm9.606 4.31v-3.4c0-.514-.188-.86-.732-.86-.492 0-.962.325-1.412.806v3.453h-.932v-3.4c0-.514-.188-.86-.732-.86-.49 0-.962.325-1.413.806v3.453h-.93v-4.99h.746l.115.72c.47-.43 1.035-.826 1.736-.826.733 0 1.13.314 1.32.827.45-.43 1.055-.826 1.756-.826.955 0 1.415.565 1.415 1.465v3.63h-.93zm4.508.06c-.492 0-.942-.092-1.257-.22v1.968l-.93.136v-6.936h.742l.115.722c.376-.44.89-.83 1.622-.83 1.077 0 1.967.795 1.967 2.46 0 1.82-1.05 2.7-2.26 2.7zm.146-4.33c-.565 0-1.004.346-1.402.88v2.396c.377.188.68.27 1.214.27.784 0 1.36-.637 1.36-1.87 0-1.09-.493-1.675-1.172-1.675zm6.234 4.27l-.106-.67c-.397.407-.94.774-1.757.774-.9 0-1.465-.544-1.465-1.392 0-1.242 1.067-1.733 3.15-1.954v-.21c0-.626-.378-.846-.954-.846-.606 0-1.182.187-1.726.43l-.125-.808c.596-.24 1.16-.417 1.935-.417 1.214 0 1.8.492 1.8 1.6v3.495h-.753zm-.18-2.533c-1.84.177-2.227.68-2.227 1.193 0 .405.27.666.742.666.545 0 1.067-.272 1.486-.7v-1.162zm5.448 2.532v-3.4c0-.514-.22-.86-.764-.86-.492 0-.993.325-1.443.806v3.453h-.93v-4.99h.745l.115.72c.47-.43 1.056-.826 1.767-.826.942 0 1.444.565 1.444 1.465v3.63h-.93zm4.232.44c-.43 1.16-.962 1.463-1.79 1.463-.124 0-.23-.02-.323-.042l-.126-.815c.16.042.35.073.527.073.388 0 .648-.188.795-.586l.188-.51-1.82-4.94.92-.144 1.36 3.975 1.328-3.902h.952L152 59.25z" fill="#6F6456"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="55.139px" viewBox="0 0 189 55.139" width="189px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 189 55.139"><path d="m23.333 0l-23.333 14.135v26.865l6.06 3.568v-26.865l17.278-10.504 17.292 10.488 0.074 0.042-0.008 26.798 6.001-3.527v-26.865l-23.364-14.135zm3.088 16.538v31.407l-3.088 1.889-3.091-1.896v-31.376l-8.003 4.928v26.86l11.094 6.789 11.189-6.837v-26.829l-8.101-4.935z" fill="#ED7402"/><path d="m12.239 21.491l8.003 4.886v-9.814l-8.003 4.928zm14.182-4.953v9.902l8.101-4.967-8.101-4.935zm20.276-2.403l-23.364-14.135-23.333 14.135 6.06 3.568 17.278-10.504 17.365 10.53 5.994-3.594z" fill="#F8B97F"/><path d="m82.328 39.984l-1.608-20.54-8.156 20.651h-2.656l-8.156-20.651-1.571 20.541h-3.293l2.058-25.814h4.34l8.043 21.174 8.044-21.174h4.301l2.021 25.814h-3.367z" fill="#131108"/><path d="m99.91 39.984l-0.375-2.396c-1.421 1.458-3.366 2.769-6.284 2.769-3.218 0-5.237-1.945-5.237-4.977 0-4.452 3.815-6.209 11.261-6.996v-0.748c0-2.244-1.348-3.03-3.406-3.03-2.17 0-4.227 0.673-6.172 1.533l-0.449-2.88c2.133-0.861 4.153-1.496 6.922-1.496 4.339 0 6.436 1.757 6.436 5.723v12.498h-2.7zm-0.635-9.055c-6.586 0.636-7.97 2.432-7.97 4.266 0 1.457 0.973 2.394 2.657 2.394 1.945 0 3.815-0.974 5.312-2.508v-4.152h0.001z" fill="#131108"/><path d="m121.72 21.876l0.485 2.992-3.404 0.336c0.486 0.824 0.712 1.76 0.712 2.769 0 3.817-3.219 6.134-6.848 6.134-0.449 0-0.898-0.037-1.348-0.111-0.523 0.338-0.897 0.75-0.897 1.085 0 0.636 0.634 0.787 3.777 1.349l1.272 0.223c3.778 0.673 6.135 1.871 6.135 4.639 0 3.741-4.078 5.5-8.715 5.5-4.64 0-8.343-1.458-8.343-4.6 0-1.834 1.271-3.256 3.777-4.603-0.784-0.562-1.121-1.198-1.121-1.872 0-0.861 0.672-1.722 1.87-2.432-1.982-0.973-3.33-2.879-3.33-5.312 0-3.852 3.217-6.208 6.846-6.208 1.795 0 3.368 0.522 4.604 1.496l4.53-1.385zm-13.99 20.052c0 1.424 1.834 2.471 5.312 2.471 3.48 0 5.424-1.197 5.424-2.693 0-1.086-0.822-1.832-3.365-2.282l-2.134-0.375c-0.972-0.187-1.495-0.299-2.207-0.448-2.1 1.045-3.03 2.094-3.03 3.327zm4.86-17.733c-2.244 0-3.629 1.722-3.629 3.891 0 2.058 1.421 3.665 3.629 3.665 2.283 0 3.704-1.682 3.704-3.815 0.01-2.132-1.49-3.741-3.7-3.741z" fill="#131108"/><path d="m137.58 31.416h-12.122c0.112 4.15 2.094 6.098 5.2 6.098 2.583 0 4.453-1.009 6.397-2.544l0.484 2.994c-1.907 1.497-4.188 2.394-7.143 2.394-4.642 0-8.271-2.807-8.271-9.354 0-5.724 3.368-9.239 7.856-9.239 5.199 0 7.595 4.002 7.595 8.94v0.711zm-7.63-7.033c-2.059 0-3.817 1.459-4.34 4.526h8.604c-0.41-2.881-1.68-4.526-4.26-4.526z" fill="#131108"/><path d="m151.61 39.984v-12.16c0-1.832-0.786-3.067-2.73-3.067-1.759 0-3.555 1.161-5.163 2.88v12.347h-3.329v-17.846h2.655l0.412 2.582c1.683-1.533 3.78-2.955 6.321-2.955 3.369 0 5.166 2.019 5.166 5.236v12.983h-3.33z" fill="#131108"/><path d="m164.78 40.284c-3.143 0-5.199-1.124-5.199-4.716v-10.624h-2.694v-2.806h2.694v-5.949l3.255-0.485v6.434h3.853l0.449 2.806h-4.302v10.025c0 1.461 0.599 2.357 2.47 2.357 0.598 0 1.121-0.035 1.531-0.112l0.45 2.843c-0.57 0.112-1.35 0.227-2.51 0.227z" fill="#131108"/><path d="m175.82 40.357c-4.752 0-8.194-3.403-8.194-9.278 0-5.874 3.442-9.314 8.194-9.314 4.787 0 8.305 3.44 8.305 9.314 0 5.875-3.52 9.278-8.3 9.278zm0-15.788c-3.217 0-4.826 2.769-4.826 6.51 0 3.668 1.683 6.511 4.826 6.511 3.291 0 4.938-2.77 4.938-6.511-0.01-3.666-1.73-6.51-4.94-6.51z" fill="#131108"/><path d="m186.48 24.81c-1.338 0-2.268-0.929-2.268-2.318 0-1.379 0.95-2.328 2.268-2.328 1.34 0 2.27 0.939 2.27 2.328 0 1.378-0.95 2.318-2.27 2.318zm0-4.376c-1.078 0-1.938 0.739-1.938 2.058 0 1.31 0.859 2.049 1.938 2.049 1.09 0 1.949-0.739 1.949-2.049 0-1.319-0.87-2.058-1.95-2.058zm0.67 3.297l-0.768-1.099h-0.249v1.059h-0.44v-2.568h0.779c0.54 0 0.898 0.27 0.898 0.75 0 0.37-0.201 0.609-0.52 0.709l0.74 1.049-0.44 0.1zm-0.68-2.209h-0.34v0.759h0.319c0.29 0 0.471-0.12 0.471-0.379 0-0.25-0.16-0.38-0.45-0.38z" fill="#131108"/></svg>
\ No newline at end of file
diff --git a/lib/web/images/magento-logo.svg b/lib/web/images/magento-logo.svg
index 6dcc79d33b2942ba0c43f622a9ea0826e131396f..0d5cc0e6233d6199272dd9a38975c2a3a3e167b1 100644
--- a/lib/web/images/magento-logo.svg
+++ b/lib/web/images/magento-logo.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1 Tiny//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd'>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink">
- <path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/>
- <path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/>
- <path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/>
- <path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/>
- <path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/>
- <path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/>
- <path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/>
- <path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/>
- <g fill="#E85D22">
- <path d="m26.845 8.857"/>
- <polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/>
- <polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/>
- </g>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="214px" xml:space="preserve" height="62px" viewBox="0 0 214 62" baseProfile="tiny" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="m93.166 44.96l-1.809-23.096-9.17 23.221h-2.988l-9.17-23.221-1.767 23.096h-3.702l2.314-29.026h4.88l9.045 23.809 9.045-23.809h4.836l2.271 29.026h-3.785z" fill="#131108"/><path d="m112.94 44.96l-0.421-2.692c-1.597 1.639-3.785 3.112-7.066 3.112-3.619 0-5.889-2.188-5.889-5.596 0-5.006 4.29-6.981 12.663-7.867v-0.841c0-2.523-1.515-3.407-3.83-3.407-2.439 0-4.754 0.757-6.94 1.725l-0.505-3.238c2.398-0.969 4.67-1.682 7.783-1.682 4.88 0 7.236 1.976 7.236 6.435v14.051h-3.02zm-0.72-10.182c-7.406 0.715-8.963 2.735-8.963 4.796 0 1.642 1.095 2.693 2.989 2.693 2.187 0 4.291-1.095 5.974-2.82v-4.669z" fill="#131108"/><path d="m137.46 24.599l0.546 3.364-3.826 0.378c0.546 0.926 0.799 1.979 0.799 3.113 0 4.292-3.618 6.899-7.699 6.899-0.504 0-1.011-0.042-1.514-0.126-0.589 0.38-1.01 0.844-1.01 1.22 0 0.716 0.714 0.886 4.248 1.517l1.432 0.252c4.249 0.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.381-1.64-9.381-5.173c0-2.062 1.431-3.66 4.248-5.174-0.882-0.631-1.26-1.348-1.26-2.104 0-0.969 0.756-1.936 2.103-2.734-2.229-1.095-3.744-3.238-3.744-5.974 0-4.332 3.616-6.981 7.697-6.981 2.019 0 3.786 0.587 5.175 1.682l5.08-1.558zm-15.73 22.547c0 1.599 2.06 2.775 5.972 2.775 3.913 0 6.099-1.345 6.099-3.027 0-1.222-0.924-2.061-3.784-2.566l-2.397-0.422c-1.095-0.208-1.682-0.336-2.481-0.502-2.36 1.177-3.41 2.356-3.41 3.742zm5.47-19.939c-2.522 0-4.081 1.936-4.081 4.375 0 2.313 1.6 4.12 4.081 4.12 2.566 0 4.165-1.892 4.165-4.29 0-2.397-1.68-4.205-4.16-4.205z" fill="#131108"/><path d="m155.3 35.325h-13.631c0.125 4.669 2.354 6.856 5.847 6.856 2.904 0 5.007-1.135 7.193-2.86l0.546 3.367c-2.144 1.682-4.709 2.691-8.031 2.691-5.219 0-9.299-3.155-9.299-10.519 0-6.435 3.787-10.388 8.835-10.388 5.846 0 8.54 4.5 8.54 10.052v0.801zm-8.58-7.908c-2.313 0-4.291 1.641-4.879 5.09h9.675c-0.47-3.239-1.9-5.09-4.8-5.09z" fill="#131108"/><path d="m171.07 44.96v-13.673c0-2.06-0.883-3.449-3.07-3.449-1.977 0-3.996 1.305-5.807 3.239v13.883h-3.743v-20.067h2.986l0.463 2.903c1.893-1.724 4.251-3.323 7.108-3.323 3.786 0 5.808 2.271 5.808 5.888v14.599h-3.75z" fill="#131108"/><path d="m185.88 45.298c-3.532 0-5.846-1.265-5.846-5.304v-11.946h-3.03v-3.156h3.03v-6.688l3.66-0.546v7.234h4.332l0.505 3.156h-4.837v11.273c0 1.643 0.675 2.651 2.776 2.651 0.673 0 1.262-0.041 1.724-0.127l0.506 3.196c-0.63 0.128-1.51 0.257-2.81 0.257z" fill="#131108"/><path d="m198.29 45.38c-5.342 0-9.213-3.827-9.213-10.434 0-6.605 3.871-10.473 9.213-10.473 5.383 0 9.339 3.868 9.339 10.473 0 6.607-3.96 10.434-9.34 10.434zm0-17.753c-3.617 0-5.426 3.113-5.426 7.319 0 4.125 1.892 7.321 5.426 7.321 3.702 0 5.553-3.114 5.553-7.321 0-4.122-1.93-7.319-5.55-7.319z" fill="#131108"/><path d="m210.28 27.897c-1.505 0-2.551-1.045-2.551-2.606 0-1.55 1.067-2.618 2.551-2.618 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.07 2.606-2.55 2.606zm0-4.92c-1.214 0-2.18 0.831-2.18 2.314 0 1.472 0.966 2.303 2.18 2.303 1.225 0 2.191-0.832 2.191-2.303 0-1.483-0.98-2.314-2.19-2.314zm0.75 3.708l-0.863-1.237h-0.281v1.191h-0.495v-2.888h0.878c0.606 0 1.01 0.303 1.01 0.843 0 0.416-0.225 0.686-0.585 0.798l0.833 1.18-0.5 0.113zm-0.76-2.484h-0.383v0.854h0.359c0.325 0 0.53-0.135 0.53-0.427 0-0.281-0.18-0.427-0.51-0.427z" fill="#131108"/><g fill="#E85D22"><path d="m26.845 8.857"/><polygon points="53.692 15.5 53.692 46.5 46.021 50.929 46.021 19.929 26.845 8.857 7.67 19.928 7.67 50.929 0 46.5 0 15.5 26.845 0"/><polygon points="26.847 62 15.341 55.356 15.341 24.357 23.011 19.928 23.011 50.929 26.845 53.257 30.682 50.929 30.682 19.929 38.353 24.357 38.353 55.356"/></g></svg>
\ No newline at end of file
diff --git a/package.json b/package.json
index 727073599df61173259a9d2999b635847377feb1..9880eb0adcab6cdc31831f6ad4acbdf815995cd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Magento2",
- "author": "Magento Inc.",
+ "author": "Magento Commerce Inc.",
"description": "Magento2 node modules dependencies for local development",
"version": "2.0.0-rc2",
"license": "(OSL-3.0 OR AFL-3.0)",