manually re-merge with upstream/master
Merge branch 'pr-visitor-meta' into dev-master
Merge branch 'show-tracking-id' into dev-master
Merge branch 'show-tracking-id' into dev-master
updates
Merge branch 'show-tracking-id' into dev-master

Conflicts:
	wpsc-includes/purchaselogs.class.php
Merge branch 'show-tracking-id' into dev-master
Merge branch 'show-tracking-id' into dev-master
Merge branch 'show-tracking-id' into dev-master
Merge branch 'show-tracking-id' into dev-master
Merge branch 'show-tracking-id' into dev-master
Merge branch 'pr-visitor-meta' into dev-master
Merge branch 'master' of github.com:wp-e-commerce/WP-e-Commerce into dev-master
Merge branch 'pr-visitor-meta' into dev-master
Merge branch 'pr-visitor-meta' into dev-master
wpsc_get_remaining_quantity was using the global cart class, intialized or not, to get the remaining quantity of a product
cart::get_remaining product quantity was not using any class functionality.

Put hte get remaining quantity logic in the standalone function, have the class function call the stnadalone
function for backwards compatibility.
Merge branch 'pr-visitor-meta' into dev-master
Merge branch 'pr-remaining-quantity' into dev-master
Update ajax hooks to not fire when other requests to be processed
Change ajax action name to not have extra 's'
Update ajax hooks to not fire when other requests to be processed
Change ajax action name to not have extra 's'