新加
Merge branch 'master' of https://github.com/Foboy/GoGoJP

Conflicts:
	www/partials/product/add-product.html