[maven-release-plugin] prepare for next development iteration
#961 - Fixed changing font size for the same font multiple times in Redactor editor
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
#965 - Added ENUM
#965 - Added ENUM
Fixes #967
#968 - enable level 2 cache for catalog collection on SiteImpl
Fixes #967

(cherry picked from commit 7618faba51d62edf17b33abbbd3144aa056528cd)
#592, #631 - Renamed antisamy file to avoid thymeleaf error when antisamy kicks in and allow for error msg to bubble up to the admin.
#592, #631 - Allowed span to have empty tags since redactor defaults to empty span tags sometimes.
#592, #631 - Turn off antisamy by default.
#967 - Fixed typo.   Ensure that default tracker does not use a name.
#967 - Fixed typo.   Ensure that default tracker does not use a name.
#974 - Don't allow the MapFieldPersistenceProvider to run if the RuleFieldPersistenceProvider has already run (avoids overriding dirty state detection)
#974 - Don't allow the MapFieldPersistenceProvider to run if the RuleFieldPersistenceProvider has already run (avoids overriding dirty state detection)
(cherry picked from commit cfa8709)
#976 - Address ordering of property file consumption such that implementation shared and regular property files are last, behind any external property override file.
#976 - Address ordering of property file consumption such that implementation shared and regular property files are last, behind any external property override file.
(cherry picked from commit 9f01bd6)
#977 - Add dependent field visibility helpers for admin
Fixes #980 - Do not utilize a repackaged version of the Jpa2PersistenceUnitInfoDecorator as some classloaders might not load it appropriately
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/provider/RuleFieldPersistenceProvider.java
	admin/broadleaf-open-admin-platform/src/main/resources/antisamy-myspace-1.4.4.xml
	admin/broadleaf-open-admin-platform/src/main/resources/antisamy-myspace.xml
	admin/broadleaf-open-admin-platform/src/main/resources/bl-open-admin-contentClient-applicationContext.xml
	admin/broadleaf-open-admin-platform/src/main/resources/messages/OpenAdminMessages.properties
	admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/components/entityForm.html
	common/src/main/java/org/broadleafcommerce/common/extensibility/jpa/MergePersistenceUnitManager.java
	common/src/main/java/org/springframework/orm/jpa/persistenceunit/Jpa2PersistenceUnitInfoDecorator.java
	common/src/main/resources/antisamy-myspace-1.4.4.xml