Merge pull request #9 from cristiroma/master

refs #1965 - Refactor cms_country