refs #1965 - Refactor cms_country and cms_region fields
Merge pull request #67 from cristiroma/master

refs #1965 - Refactor cms_country and cms_region fields