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

# By xcoolray (2) and zhengrunqiang (2)
# Via zhengrunqiang (2) and xcoolray (1)
* 'master' of https://github.com/Foboy/GoGoJP:
  13
  123
  login comet
  comet

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