Remove possible null pointer dereference
#1065 - Add cache for sku metadata inspection
Fixes #1066 - Allow URL overrides for EntityFormAction buttons
#1065 - Add cache for sku metadata inspection
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/handler/SkuCustomPersistenceHandler.java
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/handler/SkuCustomPersistenceHandler.java
#987 - Add extension manager for product/category template replacement
#935 - Consolidate utility function
adding coordinate type for geolocation searches
Merge pull request #1067 from brentlemons/develop

adding coordinate type for geolocation searches
Merge pull request #1060 from ArloL/patch-18

Remove possible null pointer dereference
Fixes #1070 - Resolve an issue with foreign key lookup displays when the value is selected from the lookup grid specifically with SkuBundleItems and looking up Skus
Merge branch 'develop' into advanced-bundle

Conflicts:
	admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/handler/SkuCustomPersistenceHandler.java