Updating some var'd variables
Merge branch 'feature' of https://github.com/ten24/Slatwall.git into feature