Merge branch 'country-region-currency-util' into customer-meta-and-checkout

Conflicts:
	wpsc-admin/settings-page.php
	wpsc-components/theme-engine-v1/helpers/ajax.php
	wpsc-components/theme-engine-v1/helpers/checkout.php
	wpsc-components/theme-engine-v1/helpers/form.php
	wpsc-components/theme-engine-v1/widgets/donations_widget.php
	wpsc-core/wpsc-includes.php
	wpsc-includes/checkout.class.php
	wpsc-includes/merchant.class.php
	wpsc-includes/misc.functions.php
	wpsc-includes/processing.functions.php
	wpsc-includes/shipping.helper.php
	wpsc-includes/shopping_cart_functions.php
	wpsc-merchants/chronopay.php
	wpsc-merchants/paypal-express.merchant.php
Merge branch 'customer-meta-and-checkout' into dev-master

Conflicts:
	wpsc-admin/settings-page.php