no message
Merge branch 'master' of https://github.com/Foboy/GoGoJP

# By zhengrunqiang (2) and wangxiao (1)
# Via zhengrunqiang (2) and wangxiao (1)
* 'master' of https://github.com/Foboy/GoGoJP:
  gengxin
  123
  123

Conflicts:
	www/partials/order.html