Added transaction wrappers  to AddressServiceImpl and StaticAssetServiceImpl #569.
Resolves #575 - Add the currency resolver to the admin and give helpful error messages for problems with determining the currency from the Broadleaf request context
Fixes #532 - Remove password fields from admin users. Admin users can use ‘forgot password’ or reset their own password via the navbar
Added UriPropertyValidator (blUriValidator) and configured it for the URL field in Page, Product, and Category. Fixes - #608.
If different validation behavior is desired, the blUrlValidator component can be easily overridden.
Resolves #543 - Manually look up the current site and sandbox when resolving static assets in order to not require them to be under Spring security
Moved MergeCart logic into CartStateFilter (was in AuthenticationSuccessHandler).   Fixes #429.
Also addresses #612 by allowing translations of cart items instead of deleting the cart.
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/file/service/StaticAssetServiceImpl.java
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/page/domain/PageImpl.java
	admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/web/file/StaticAssetViewController.java
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/filter/BroadleafAdminRequestProcessor.java
	admin/broadleaf-open-admin-platform/src/main/resources/config/bc/admin/common.properties
	common/src/main/java/org/broadleafcommerce/common/web/BroadleafRequestContext.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/domain/CategoryImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/domain/ProductImpl.java
	core/broadleaf-profile/src/main/java/org/broadleafcommerce/profile/core/service/AddressServiceImpl.java
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop

Conflicts:
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/order/security/extension/AbstractAuthSuccessHandlerExtensionHandler.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/order/security/extension/AuthSuccessHandlerExtensionHandler.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/order/security/extension/AuthSuccessHandlerExtensionManager.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/service/AbstractUpdateCartServiceExtensionHandler.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/service/UpdateCartServiceExtensionHandler.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/service/UpdateCartServiceImpl.java
	core/broadleaf-framework/src/main/resources/config/bc/fw/common.properties