#813. Upgrading solrj to the latest.
Fixes #798 - Add an ImageIO processor for processing/resizing CMYK JPEG images
Fixes #729 - Reference groups and tabs by their display (potentially translated) name so they will show up as expected on the form
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	admin/broadleaf-open-admin-platform/pom.xml
	admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/form/entity/EntityForm.java
Merge branch 'BroadleafCommerce-3.1.x' into develop
Merge branch 'develop' into sku_browsing