Target latest 3.1 SNAPSHOT
#34 Updated JavaScript and Product detail page.
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x

Conflicts:
	site/src/main/webapp/WEB-INF/templates/catalog/partials/productOptions.html
	site/src/main/webapp/js/cartOperations.js
Default the image manipulation via URL parameters to false
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Update to 3.0.12-GA
Update to 3.0.13-SNAPSHOT
Update to 3.1.4-GA
Merge tag 'broadleaf-3.1.4-GA'