#997 - set 0.0 on null input for rule builder price fields
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
#997 -allow for blank lines to be saved as of now. main issue can/will be resolved with form validation as discussed in #405
#997 -allow for blank lines to be saved as of now. main issue can/will be resolved with form validation as discussed in #405
#1025 - adding unit tests for CompleteOrderActivity and ValidateAndConfirmPaymentActivity
#1025 - Adding RecordOfferUsageActivity Unit Test and cleaning up structure of other checkout activity tasks
#1026. Added checks to ensure that we are not attempting to use session
if it is not allowed.  Added the concept of
SessionlessHttpServletRequestWrapper, which now gets set in the
StatelessSessionFilter.  This will throw an exception if a call to
retrieve a session is invoked.
#1026. Ensuring that sessions are not used when we are not supposed to
be using them.
Merge branch 'BroadleafCommerce-3.1.x' into develop
Adding isActive() method.
Changed this filter to set the customer using CustomerState rather than
directly via the request API.
Changed this filter to set the customer using CustomerState rather than
directly via the request API.
#1029. Added friendlyName to search Field entity.
#998 - Fix basic map field add validation problem
#998 - Fix basic map field add validation problem
#1030 - Don't persist a map value if the parent entity itself has not been persisted
Merge remote-tracking branch 'origin/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/MapFieldPersistenceProvider.java
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop
Merge remote-tracking branch 'origin/develop' into advanced-bundle