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

# By kbtyc
# Via kbtyc
* 'master' of https://github.com/Foboy/GoGoJP:
  no message
  no message
Merge branch 'master' of https://github.com/Foboy/GoGoJP

# By kbtyc
# Via kbtyc
* 'master' of https://github.com/Foboy/GoGoJP:
  no message

Conflicts:
	www/partials/order.html