Added xmlFormat to all the Vertex XML fields
Updated Version 3.4.031
Working on currency updates for tax
Merge branch 'develop' into feature-vertexFixes
Updates to currency
Expanded countries to have a defaultCurrency
Updated Version 3.4.030.030
Updated the country dbData
Updated Version 3.4.030.031
Merge branch 'master' into develop

Conflicts:
	version.txt
Modified Update Script
Updated Version 3.5.000
Updated Version 3.5.000.001
Merge branch 'develop' into develop-4

Conflicts:
	admin/views/entity/detailcountry.cfm
	config/dbdata/SlatwallUpdateScript.xml.cfm
	version.txt
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into develop-4
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into develop-4