#515 - Fix compilation error
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop
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
Fixes #516 - Mark the discount type on offers as a required field in the admin
Enhancement #423

Introduced File Provider API and initial FileSystem based implementation.
Fixes #527 which was checking retail price instead of sale price.
Revert "Enhancement #423"

This reverts commit d06b5735cad4cba3d8ff19fe57db4b30e3039a26.
[maven-release-plugin] prepare release broadleaf-3.0.4-GA
[maven-release-plugin] prepare for next development iteration
#81
#499 - RuleBuilder matched field only searched in the first entity in inheritance hierarchy
#468 - Update admin translate icon per requirements
#410 - JavaScript minifier can potentially throw unrecoverable exception
#341 - Notify user that admin does not work without JavaScript
Merge tag 'broadleaf-3.0.4-GA'

[maven-release-plugin]  copy for tag broadleaf-3.0.4-GA
Fixes #529 - Fix for rule builders never sending built JSON data to server even with a valid rule
Merge branch 'BroadleafCommerce-3.0.x' into develop

Conflicts:
	admin/broadleaf-admin-module/pom.xml
	admin/broadleaf-contentmanagement-module/pom.xml
	admin/broadleaf-open-admin-platform/pom.xml
	admin/pom.xml
	common/pom.xml
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework/pom.xml
	core/broadleaf-profile-web/pom.xml
	core/broadleaf-profile/pom.xml
	core/pom.xml
	integration/pom.xml
	pom.xml
[maven-release-plugin] prepare release broadleaf-3.0.5-GA
[maven-release-plugin] prepare for next development iteration