#544 - Start at removing the aop:config XML configuration in favor of @Transactional annotations on the components themselves
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/inventory/service/AvailabilityServiceImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/payment/service/PaymentInfoServiceImpl.java
	core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/payment/service/SecurePaymentInfoServiceImpl.java
	core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-persistence.xml
Merge branch 'BroadleafCommerce-3.1.x' into develop