closes Issue #1826
Merge branch 'feature-loyalty' of https://github.com/ten24/Slatwall.git into feature-loyalty