Merge branch 'Adam'
Merge branch 'Adam'
CountryData

Added all strings for country data
Merge branch 'Joe' into Adam