send express, receive express
express order
Merge remote-tracking branch 'origin/master'

Conflicts:
	amazon_wx/grails-app/domain/com/amazon/cn/nj/wx/Config.groovy
	amazon_wx/grails-app/domain/com/amazon/cn/nj/wx/ExpressOrder.groovy
	amazon_wx/grails-app/views/commodity/index.gsp
Merge remote-tracking branch 'origin/master'
post order