#987 - Additional refactorings and helper methods for AdvancedCMS support
Move interface to AdvOffer
Use UTF-8 instead of the default encoding
Properly close streams
Fixes #1038 - Use custom criteria to reliably determine what classes sub-collection lookups originated from
#1039 - Show generated URLs for Product/Category/Page in admin
Merge pull request #1031 from ArloL/patch-1

Use UTF-8 instead of the default encoding
Merge branch 'patch-2' of github.com:ArloL/BroadleafCommerce into ArloL-patch-2 and cleaned up a few areas as a result

Conflicts:
	common/src/main/java/org/broadleafcommerce/common/extensibility/context/merge/MergeManager.java
Merge branch 'ArloL-patch-2' into develop
[maven-release-plugin] prepare release broadleaf-3.0.13-GA
[maven-release-plugin] prepare for next development iteration
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

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.1.8-GA
[maven-release-plugin] prepare for next development iteration
Merge branch 'BroadleafCommerce-3.1.x' into develop

Conflicts:
	admin/broadleaf-admin-functional-tests/pom.xml
	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
#987 - Additional refactorings and helper methods for AdvancedCMS support
#1040 - Support extension of persistence for product option sku permutations from the admin
(cherry picked from commit 6f1ecb9)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop
Refactored Page to add additional extension points.  #1041
#1040 - Add license header