Merge branch 'D1314' of github.com:loadedcommerce/loaded7 into D1314
#1314 - working on catalog coupons