Merge remote-tracking branch 'upstream/master' into cart-class-to-its-own-file

Conflicts:
	wpsc-includes/cart.class.php
Merge remote-tracking branch 'upstream/master' into cart-class-to-its-own-file
Require CSV rows to have product titles so we don't import empty CSV rows.  Filterable, naturally.
Add __return_true'able filters for stock unpublishing notifications and unpublishing
Only show UPS debugging info when an admin is logged in and WP_DEBUG is true.
Remove wpsc_google_checkout() call from cart-widget.php
Merge branch 'master' of github.com:wp-e-commerce/WP-e-Commerce
testing and documentation
more implementation and testing
Add some inline filter documentation and proper variable for wpsc_product_image
Replace html_entity_decode with wp_specialchars_decode in our scrubbing of USPS responses.  They're pretty crappy about consistent response HTML.
Fix metadata notice in wpsc_product_image().  Fixes #983
Send property to filter so that hooks can select their option if selected
Merge pull request #1029 from marcusds/improve-coupon-filter

Send property to filter so that hooks can select their option if selecte...
Merge branch 'country-region-currency-util' into dev-master

Conflicts:
	wpsc-includes/wpsc-meta-util.php
Merge branch 'cart-class-to-its-own-file' into dev-master
Merge branch 'master' into dev-master

Conflicts:
	wpsc-components/theme-engine-v1/helpers/template-tags.php