Merge pull request #1081 from JeffPyeBrook/pr-fix-empty-region-list

User Profile Display and Update
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names

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

Remove ctype from parameter type check
Merge remote-tracking branch 'upstream/master' into dev-master