Merge pull request #21 from cristiroma/master

refs #1965 - Refactor cms_country and cms_region fields
Small bug fixed on get_range_states_for_ammap
Merge pull request #22 from cristiroma/master

refs #1965 - Refactor cms_country
Merge pull request #23 from dragos-dumi/master

Small bug fixed on get_range_states_for_ammap
Merge pull request #24 from cristiroma/master

refs #1965 - Renamed in code the field_range_state to field_country
Version 6.1
Merge pull request #25 from cristiroma/master

refs #1974 - Set format for image caption field