Merge remote-tracking branch 'upstream/master' into eliminate-dynamic-js

Conflicts:
	wpsc-core/wpsc-deprecated.php
Eliminated dynamically generated admin javascript
Merge branch 'eliminate-dynamic-js' into customer-meta-and-checkout

Conflicts:
	wpsc-core/wpsc-deprecated.php