[maven-release-plugin] prepare release broadleaf-3.0.5-GA
[maven-release-plugin] prepare for next development iteration
update version
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
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.
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
#81 - Fix equals and hashcode for CategoryProductXref
Merge branch '3.1.0-ALPHA3' into develop
#461 - Parent Order Item should play a role in OrderItem equals() method
Merge branch 'develop' into feature-sitemaps