#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