#373 - Untested work in progress of refreshing CartState when an order has been persisted
Fixes #259 : Thymeleaf version 2.0.17 will return a null pointer exception when there is no request context.
#373 - Fix remaining issues with refreshing CartState when an Order is persisted
Resolves #439 - Exclude jsp-api from being brought in by Solr core
#142 - Make URLs for duplicate static assets uploaded in the admin respect file extensions
Resolves #191 - Restrict the product options being viewed to only those that are related to the product when editing a Sku
#329 - Add null pointer exception protection to the admin errors processor
Resolves #196 - Ensure that an error summary is shown for fields that fail validation when adding a new entity
Merge pull request #373 from BroadleafCommerce/cartstaterefresher

Add CartStateRefresher and OrderEntityListener to update the current cart whenever it is saved within a single request
Merge pull request #142 from BroadleafCommerce/admin-duplicate-assets

When uploading an asset, if a filename collision is detected, the new generated name is not correct
#446 Admin annotation overrides for defaultCategory were trying to apply to defaultCategory.searchFacets
#449 - fixes rare transaction rollback problem for programmatic transactions
[maven-release-plugin] prepare release broadleaf-3.0.3-GA
#448. Updated Jersey. Also removed some dependency exclusions that
involve Jersey and Jackson for serialization of JSON for REST services.
[maven-release-plugin] prepare for next development iteration
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/entity/AdminProductController.java
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/pom.xml
	common/pom.xml
	common/src/main/java/org/broadleafcommerce/common/email/service/EmailServiceImpl.java
	common/src/main/java/org/broadleafcommerce/common/sandbox/dao/SandBoxDaoImpl.java
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
Revert: [maven-release-plugin] prepare release broadleaf-3.0.3-GA (6785380)
Revert: #446 Admin annotation overrides for defaultCategory were trying to apply to defaultCategory.searchFacets (acea014)
Merge remote-tracking branch 'origin/develop' into childoi
#446 : Address property override issues for @AdminPresentationToOneLookup annotated fields