Fixes #516 - Mark the discount type on offers as a required field in the admin
[maven-release-plugin] prepare release broadleaf-3.0.4-GA
[maven-release-plugin] prepare for next development iteration
#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
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
Merge branch 'develop' into feature-sitemaps