#8 code updated with base changes from Canadensys. Removed e-mail Locale mapping necessity.
#8 code updated with base changes from Canadensys. Removed e-mail Locale mapping necessity.