Conflicts:
web/src/main/webapp/html/fore/coupon.html
web/src/main/webapp/html/fore/css/coupon.12b27a6d2906748f4b06.css
web/src/main/webapp/html/fore/css/coupon.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/coupon.e025e652173e64d52029.css
web/src/main/webapp/html/fore/css/price-compare.12b27a6d2906748f4b06.css
web/src/main/webapp/html/fore/css/price-compare.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/price-compare.e025e652173e64d52029.css
web/src/main/webapp/html/fore/css/resource-edit.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/resource-list.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/send-record.12b27a6d2906748f4b06.css
web/src/main/webapp/html/fore/css/send-record.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/send-record.e025e652173e64d52029.css
web/src/main/webapp/html/fore/css/shop.12b27a6d2906748f4b06.css
web/src/main/webapp/html/fore/css/shop.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/shop.e025e652173e64d52029.css
web/src/main/webapp/html/fore/css/vendors.12b27a6d2906748f4b06.css
web/src/main/webapp/html/fore/css/vendors.7387e1ebf2bfa69be577.css
web/src/main/webapp/html/fore/css/vendors.e025e652173e64d52029.css
web/src/main/webapp/html/fore/js/coupon.12b27a6d2906748f4b06.js
web/src/main/webapp/html/fore/js/coupon.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/coupon.e025e652173e64d52029.js
web/src/main/webapp/html/fore/js/price-compare.e025e652173e64d52029.js
web/src/main/webapp/html/fore/js/resource-edit.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/resource-list.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/send-record.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/shop.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/vendors.12b27a6d2906748f4b06.js
web/src/main/webapp/html/fore/js/vendors.7387e1ebf2bfa69be577.js
web/src/main/webapp/html/fore/js/vendors.e025e652173e64d52029.js
web/src/main/webapp/html/fore/price-compare.html
web/src/main/webapp/html/fore/resource-edit.html
web/src/main/webapp/html/fore/resource-list.html
web/src/main/webapp/html/fore/send-record.html
web/src/main/webapp/html/fore/shop.html
