removing the plural for a singular attributeCode
commiting current work on property display
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-collections
adding self maintaining propertyDisplay and formfields with validation
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into
feature-4-collections

Conflicts:
	admin/views/entity/detailcollection.cfm
fixing merge
amending previous commit
Merge pull request #2455 from ten24/feature-4-collections

Feature 4 collections