Expose the primary key for SiteCatalogXref through the interface for #945, assign a grid order to the name field on Catalog:
#945 - Further changes to the catalog model
#744 - Delete MultishipOptions when deleting orders
Fixes #874 - Mark the product option name as required in the admin
#941 - Fixed the handling of translated defaultSku fields on products
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/AdminProductTranslationExtensionHandler.java
#891 - Prepended a slash to the sectionKey or the Add button on entity pages
(cherry picked from commit acd2f98a851407079c77c1329e6ceb5a09cba027)
Fixes #908 - Ensure that validation executes on Media fields where the type of the entity passed in is the top-level class
#952 - Provide an out of the box PCI-Compliant implementation where you can make a server to server call to a configured Payment Gateway given that the Credit Card PAN enters your network. ValidateAndConfirmPaymentsActivity will either confirm or authorize/authCapture and unconfirmed transaction based on the payment type passed in. Also adds the utility methods isConfirmed and isFinalized to the OrderPayment to aid in determining when to automatically adjust the Final Payments Transaction Total before confirming or authorizing the transaction during final checkout.
Fixes #869 - Add an override of Spring's CookieResolver to look up the default Broadleaf locale if no other default locale is specified
Better results for overriding Spring's Locale resolution behavior for #869
#952 - add ability to configure the Date Format for the expiration date required by the implemented Payment Gateway. Done through a system property
#952 - add more error logging in cases where the Gateway implementation is wrong
#931 - Updating Redactor version to 9.2.5
Fixes #856 - Allow static asset transformations via URL parameters to be turned off
#952 - add billTo and Customer information on the Payment Request DTO to pass to the Gateway for processing
Fixes #931 - Finish the Redactor upgrade to 9.2.5
#886 - Added sortProperty to @AdminPresentationAdornedTargetCollection of allParentCategoryXrefs of CategoryImpl so that display order gets populated (instead of being null which caused an error when attempting to reorder)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/web/file/StaticAssetViewController.java
	admin/broadleaf-contentmanagement-module/src/main/resources/config/bc/cms/common.properties
	admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/css/admin/redactor.css
	common/src/main/java/org/broadleafcommerce/common/web/BroadleafRequestProcessor.java
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x