Merge branch 'develop' into feature-collections
Merge branch 'feature-collections' of https://github.com/ten24/Slatwall.git into feature-collections