Fixes #1027 - Make the sandbox resolver thread safe as SimpleDateFormat is not
Fixes #949 - Allow rule builders to operate off of TEXT_LIST types (e.g. List<String>)
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Fixes #1163 - Include the xref as well as the defaultParentCategory when determining subcategories for a given category
Fixes #907 - Respect ordering when computing cumulative results for related, upsale and cross-sale products in a category
#1152 - Fix an issue where html entities were still being encoded with unicode when saved into the database
#544 - Migrate existing xml-driven aop pointcuts to @Transactional annotations
#975 - Same promotion applied multiple times for a single order
(Cherry picked from 73a8fd6c3221933beb8767fa7c4cca3bebb2c1f0)
#1021 - Admin login screen does not need a footer
Fixes #405 - Add validation and a friendly error message when rule builders fail to parse into MVEL
Fixes #763 - Fix the presentation of the saved customer payments grid in the admin
Fixes #1176 - Only display tabs in the admin if they identify themselves as visible
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/messages/GeneratedMessagesEntityProfile.properties
	admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/components/entityForm.html
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/catalog/dao/CategoryDaoImpl.java
	core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-persistence.xml
	core/broadleaf-framework/src/main/resources/config/bc/jpa/domain/Category.orm.xml
	core/broadleaf-profile/src/main/resources/bl-profile-applicationContext-persistence.xml
#1163 - Make sure we are comparing ID to ID when querying for subcategories
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-framework/src/main/resources/config/bc/jpa/domain/Category.orm.xml
#1071 - Fix NPE
#1154 - Change the fieldmanager logging for not finding fields to debug since we rely on misses in normal operation
#1171 - Increase logging to ERROR when classes are not transformed as expected
Merge branch 'BroadleafCommerce-3.1.x' into develop

Conflicts:
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/provider/RuleFieldPersistenceProvider.java