Fixed merge conflict and attributeSet script bug
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into feature-4-dbDataIssue
Reverted
Merge pull request #2398 from ten24/feature-4-dbDataIssue

Feature 4 db data issue