Merge pull request #16 from cristiroma/master

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

refs #1974 - Set format for image caption field
Version 4.1