modified:   app/controllers/patch/member_addrs_controller.rb
	modified:   app/controllers/store/orders_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
	renamed:    app/views/patch/member_addrs/addship.html.erb -> app/views/store/orders/destroyaddr.js.erb
	modified:   app/views/store/orders/new_manco_addr.html.erb
Merge branch 'master' of https://github.com/jason0037/vt