#464 - Fixing index out of bounds exception if filters don't apply
update version
update version
fixing yet another bug - Array index out of bounds if content items are broke
update version
#481 and #478 - fixing framework CMS url path creation - PageDTO and StructuredContentDTO should now call the StaticAssetPathService to rewrite any static asset paths
#481 and #478 - handling another scenario
#143 and #453 - the redactor asset lookup button needs to support override asset section key. adding this as a data-select-asset-url
Fixes #336 - CSRs should be able to view offers else they get a permission denied when viewing the Order section
#489 - 3.0.4 Miscellaneous Improvements. Protect against potential NPE.
#143 - fixing Jeff's original issue with categories. Now the URL generated will be of an already persisted containing entity if possible
#452 - Error when adding Category facets
#476 - removing the @SQLDelete annotation - no archiving stores
update version
#494 - Add support for nested Maps in AdornedTargetCollections
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop
#452 - Error when adding Category facets

(cherry picked from commit 8c8561aaad0bc82f6151a1edf1bfb69fd4923cde)
Merge branch 'BroadleafCommerce-3.0.x' into develop
support direct copy class transformation via annotation
Merge branch '3.1.0-ALPHA2' 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