from KB
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/static/js/product_detail.js
from KB