refs #1965 - Refactor cms_country
Merge pull request #22 from cristiroma/master

refs #1965 - Refactor cms_country