Merge theme engine v2
Analytics incorrect amount

Fixes #1014
Added missing return values to two functions, wpsc_cart_tax and wpsc_cart_need_to_recompute_shipping_quotes
Merge pull request #1073 from JeffPyeBrook/pr-missing-retrun-values-in-utility-functions

Added missing return values to two functions, wpsc_cart_tax and wpsc_cart_need_to_recompute_shipping_quotes

Resolves issue #1072
Removed wp_die to be comply with the WPeC deprecation methodology.
Restored get and set methods after deep reflection
Checkout field id as array index
Checkout fields array is returned with the checkout field id as the index, rather than an abitrarily assinged number.  Array order is still be checkout border.
Address PR review comments
Merge pull request #1075 from JeffPyeBrook/pr-deprecate-means-go-way-nicely-not-die

Let's not die, and certainly not die without having get and set methods that work
Adjust method paramter names
Adjusted parameter names on methods to be more consistant with WPeC coding practices
**No logic changes**
renamed parameters per review suggestions
adjusted parameter names in WPSC_Country class methods
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names

Conflicts:
	wpsc-includes/wpsc-country.class.php
Merge pull request #1077 from JeffPyeBrook/pr-adjust-method-parameter-names

Adjust method parameter names
More parameter name changes
Fix some weird logic in WPSC_Country:region, as well as some doc weirdness, replacing ctype_digit with is_numeric() and using proper variables.
replace ctype test with a function to check proper type of region id
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names

Conflicts:
	wpsc-includes/wpsc-country.class.php
Sort countries by country, not by ID
more fixes