modified:   app/controllers/patch/member_addrs_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/models/ecstore/member_addr.rb
	modified:   app/views/layouts/manco_new.html.erb
	modified:   app/views/manco/main.html.erb
	modified:   app/views/manco/user.html.erb
	new file:   app/views/patch/member_addrs/_form_manco_first.html.erb
	new file:   app/views/patch/member_addrs/_form_manco_second.html.erb
	new file:   app/views/patch/member_addrs/addship.html.erb
	modified:   app/views/store/orders/_coupons.html.erb
	new file:   app/views/store/orders/new_manco.html.erb
	new file:   app/views/store/orders/ordersnew_manco.html.erb
	modified:   config/routes.rb
	modified:   db/migrate/20140824211351_add_addr_type_to_member_addrs.rb
	modified:   db/schema.rb
Merge branch 'master' of https://github.com/jason0037/vt

	config/routes.rb

	modified:   config/routes.rb