Commented out product bundle for this release
Updated Version 3.5.001
Added friendly errors
Fix for new attributeInputType
Final updates to error template
one last tweek
ok, one more.
Merge branch 'hotfix'
Updated Version 3.5.002
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-4

Conflicts:
	config/dbdata/SlatwallProductType.xml.cfm
	version.txt