Fixes #510 - Fix problems in the rule builder that caused unnecessary JSON to be sent to the server when there were no actual rules inside of a grouping. Also refactored the build process a bit to be more explicit about the type of object that the collectDataFromNode method expects (a jquery-enabled object).
Merge branch 'BroadleafCommerce-3.0.x' into develop
Merge branch 'develop' into feature-sitemaps