Fix in checkout template & product listing to close #1362
Reverting change from issue #1291
closes Issue #1336
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
Added test case for issue #1335
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
test added #1329
Closes #1329
closes Issue #1335 also includes updated test case
Closes issue #1371 & #1370
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
Closes #1374
closes Issue #1348
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
potential fix for issue #1355
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
More work on issue #1291
Closes #1291
More fixes for issue #1291
#1291