modified:   app/controllers/manco_controller.rb
	modified:   app/views/layouts/manco.html.erb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/manco/advance.html.erb
	new file:   app/views/manco/choose_express.erb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/index.html.erb
	new file:   app/views/manco/local_express.html.erb
	modified:   app/views/store/goods/world_food.html.erb
	modified:   app/views/store/orders/new_mobile.html.erb
	modified:   app/views/store/orders/wuliu_show_order.html.erb
	modified:   app/views/store/goods/world_food.html.erb
Merge branch 'master' of https://github.com/jason0037/vt