#373 - Untested work in progress of refreshing CartState when an order has been persisted
Add child order items
Merge remote-tracking branch 'origin/develop' into childoi
Merge branch 'develop' into childoi
Push all merge/persist/delete calls to the PriceOrderIfNecessaryActivity
Merge branch 'develop' into childoi
Slight fix for dependent order items when added together
Add comment
Maintain backwards compatibility with previous method
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