#1778 - Modified method to check for stock
Merge branch 'feature-events' of https://github.com/ten24/Slatwall into feature-events
#1756 Modified location option display so that only leaf nodes appear in list