modified:   app/views/store/orders/new_mobile.html.erb
Merge branch 'master' of https://github.com/jason0037/vt
	modified:   app/views/store/orders/new_mobile.html.erb
	modified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb
	modified:   app/views/manco/express.html.erb
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb
	modified:   config/locales/zh_cn.yml
	modified:   config/locales/zh_cn.yml
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/find_manco.html.erb
	new file:   app/views/manco/mancoluodipei.js.erb
	new file:   app/views/store/cart/distribution_manco.html.erb
	modified:   app/views/store/cart/manco_express.html.erb
	modified:   app/views/store/orders/arrival.html.erb
	new file:   app/views/store/orders/manco_detail.html.erb
	renamed:    app/views/store/orders/ordersnew_manco.html.erb -> app/views/store/orders/new_manco.html.erb
	new file:   app/views/store/orders/wuliu_show.html.erb
	modified:   app/views/vshop/category.html.erb
	modified:   config/routes.rb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/layouts/norsh.html.erb
	modified:   app/views/vshop/goods.html.erb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/layouts/norsh.html.erb
	modified:   app/views/manco/index.html.erb
	modified:   app/views/manco/mancoluodipei.js.erb
	modified:   app/views/vshop/category.html.erb
	modified:   app/controllers/manco_controller.rb
	modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/follow.html.erb
	modified:   app/views/store/goods/mproduct.html.erb
	modified:   config/routes.rb
	modified:   app/views/store/goods/mproduct.html.erb
	modified:   app/views/store/goods/mproduct.html.erb
	modified:   app/assets/javascripts/amaze/amazeui.basic.js
	modified:   app/assets/javascripts/amaze/amazeui.basic.min.js
	modified:   app/assets/javascripts/amaze/amazeui.js
	modified:   app/assets/javascripts/amaze/amazeui.min.js
	modified:   app/assets/javascripts/amaze/amazeui.widgets.helper.js
	modified:   app/assets/javascripts/amaze/amazeui.widgets.helper.min.js
	modified:   app/assets/javascripts/amaze/amazeui.widgets.js
	modified:   app/assets/javascripts/amaze/amazeui.widgets.min.js
	new file:   app/assets/javascripts/amaze/app.js
	modified:   app/assets/stylesheets/amaze/amazeui.basic.css
	modified:   app/assets/stylesheets/amaze/amazeui.basic.min.css
	modified:   app/assets/stylesheets/amaze/amazeui.css
	modified:   app/assets/stylesheets/amaze/amazeui.min.css
	modified:   app/assets/stylesheets/amaze/amazeui.widgets.css
	modified:   app/assets/stylesheets/amaze/amazeui.widgets.min.css
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb
	modified:   app/models/ecstore/order.rb
	modified:   app/views/admin/orders/delivery.html.erb
	modified:   app/views/admin/orders/detail.html.erb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/follow.html.erb
	modified:   app/views/manco/mancoluodipei.js.erb
	modified:   app/views/store/orders/arrival.html.erb
	modified:   app/views/store/orders/edit_manco_addr.html.erb
	modified:   app/views/store/orders/index_mobile.html.erb
	modified:   app/views/store/orders/mobile_show_order.html.erb
	modified:   app/views/store/orders/new_manco.html.erb
	modified:   app/views/store/orders/wuliu_show.html.erb
	new file:   app/views/store/orders/wuliu_show_order.html.erb
	modified:   app/views/vshop/orders.html.erb
	modified:   config/routes.rb
	modified:   db/migrate/20130121083218_create_configs.rb
	modified:   db/schema.rb
	modified:   db/migrate/20130121083218_create_configs.rb
	new file:   db/migrate/20141105022212_add_server_to_orders.rb
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/patch/member_addrs_controller.rb
	modified:   app/views/patch/member_addrs/_form_manco_first.html.erb
	modified:   app/views/patch/member_addrs/_form_manco_second.html.erb
	modified:   app/views/store/orders/arrival.html.erb
	modified:   app/views/store/orders/departure.html.erb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/views/manco/express.html.erb
	modified:   app/views/manco/find_manco.html.erb
	modified:   app/views/manco/mancoluodipei.js.erb