各种typo不能忍.. 没睡醒吧。
Merge branch 'master' of github.com:stranbird/vimi-weixin

Conflicts:
	app/models/order.rb