Signed-off-by: Yu Chen <710913502@qq.com>
Merge branch 'master' into chenyu

Conflicts:
	themes/leather/css/product.css