[maven-release-plugin] prepare release broadleaf-3.1.0-M2
[maven-release-plugin] prepare for next development iteration
#641 - Provide the ability to hide/show the ID column on list grids
Cherry picked from BroadleafCommerce-3.1.0-GA
Fixes #620 and finalizes #429 - Remove outdated merge cart service invocations by deprecating the merge cart processor as it has now been moved to the cart state processor. Also, remove any anonymous customer session attributes after their cart has been merged

(cherry picked from commit 1a6d6be66f52087fa0cf544aa5aa8416da867475)
Fixes #639 - Automatically filter archived entities in the admin. Also default Persistence event handler methods to default to not handled so that subclasses only have to override what they need to

(cherry picked from commit 8493a97902b81a0c7c04c56aaf142a727cf7e4d4)
Fixes #736 - Fix an issue where filtering by a date and then sorting caused an exception
The real cause here is that when the criteria inputs were updated with the URL parameters, we were just parsing out the parameters into a JSON object (via BLCAdmin.history.getUrlParameters()) but forgetting that the parameter values themselves could be URI-encoded. This led itself to dates only, because date filter values have a space in them (yyyy.mm.dd HH:MM:SS). The criteria value was getting overwritten with yyyy.mm.dd%20HH:MM:SS and then when we attempted to sort that, the final value for the criteria ended up being yyyy.mm.dd%2520HH:MM:SS in order to encode the '%' sign.

(cherry picked from commit e5ae7e812c8f66c30bd8a82b72cebc3339eabe28)
#749 - Enumerations without values cause an NPE in ComboField
Merge branch 'BroadleafCommerce-3.1.0-M2-x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/PersistenceManagerEventHandlerAdapter.java
	admin/broadleaf-open-admin-platform/src/main/resources/config/bc/admin/common.properties
	admin/pom.xml
	common/pom.xml
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/controller/account/BroadleafRegisterController.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/controller/account/BroadleafSocialRegisterController.java
	core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/order/security/CartStateRequestProcessor.java
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml