Working on issue #1549
Working on order delivery templates for issue #1502
Working on issue #1549
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3