modified:   app/views/layouts/tradev.html.erb
	modified:   app/views/patch/member_addrs/_form_mobile.html.erb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/views/layouts/tradev.html.erb
	app/views/patch/member_addrs/_form_mobile.html.erb
	modified:   app/views/store/goods/quality_products.html.erb
	modified:   app/views/store/goods/world_food.html.erb