Merge pull request #16 from cristiroma/master

refs #1965 - Refactor cms_country and cms_region fields