[maven-release-plugin] prepare release broadleaf-3.0.5-GA
[maven-release-plugin] prepare for next development iteration
Fixes #397 - Change the admin numeric input types to text as Chrome will submit a blank string to the server if there is a non-numeric value
Fixes #200 - Move the around the Customer and admin password encoders to application contexts that actually need it, make the SessionFixationProtectionFilter use its own encryption module rather than share the credit card one
#153 - Do not execute a database query when an empty/null string is passed to the State custom init binder when submitting shipping information on checkout
Upgrade HSQLDB version to 2.3.1

Issue #533
Fixes #441 - Provide a salting mechanism that works with a property on AdminUser or Customer
#309 - have to reset the use sale price to true on certain cases when an offer is applied and then removed and an existing price detail has to be used instead of a new one.
Fix set sku on discrete order item so it doesn't through an exception in the case of a null retail price

In the event that you have dynamic pricing, but want to add an order item with an overridden retail price that isn't in the dynamic pricing context, the add fails because the retail retrieved is null when the order service tries to set the sku on the new item. I would expect some sort of exception to be thrown in the case that there was no retail price AND no price override, but in the case that there is a price override I would expect the price override to simply become the retail price.
Merge pull request #539 from jlutteringer/patch-1

Fix set sku on discrete order item so it doesn't through an exception in...
Fixes #534 - Move MediaImpl persistence configuration into common where it belongs
Fixes #535 - Move the ContentProcessor reference away from bl-framework-web-applicationContext and into the appropriate CMS application context
Fixes #538 - Pull in web applicationContext files to the integration tests
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/broadleaf-open-admin-platform/src/main/resources/bl-open-admin-contentClient-applicationContext.xml
	admin/broadleaf-open-admin-platform/src/main/resources/bl-open-admin-contentCreator-applicationContext.xml
	admin/pom.xml
	common/pom.xml
	common/src/main/resources/org/broadleafcommerce/common/extensibility/context/merge/default.properties
	core/broadleaf-framework-web/pom.xml
	core/broadleaf-framework-web/src/main/resources/bl-framework-web-applicationContext.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 '3.1.0-ALPHA3' into develop
#461 - Parent Order Item should play a role in OrderItem equals() method
#461 - Fix related qualifiers/target bug
Use  SystemDate instead of member variable when querying for dateResolution for automaticProductBundles query.   Fixes #546.
Use  SystemDate instead of member variable when querying for dateResolution for automaticProductBundles query.   Fixes #546.
replace license