modified:   app/controllers/vshop_controller.rb
	modified:   app/views/store/orders/norsh_show_order.html.erb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/vshop_controller.rb

	modified:   app/controllers/store/orders_controller.rb
	modified:   app/controllers/vshop_controller.rb
	modified:   lib/modec_pay/payment.rb
	modified:   lib/modec_pay/weixin.rb