modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/admin/goods/_index_goods.html.erb
	modified:   app/views/admin/goods/index.html.erb
	modified:   app/views/store/orders/ordersnew_manco.html.erb
	modified:   config/routes.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	config/routes.rb

	modified:   config/routes.rb