new file:   app/controllers/shop/shopinfos_controller.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/controllers/shop/shopinfos_controller.rb
	app/controllers/shop/visitors_controller.rb
	app/models/ecstore/shop.rb
	app/models/ecstore/shops_good.rb
	app/models/ecstore/visitor.rb
	app/views/layouts/shop.html.erb
	app/views/shop/shopinfos/add_goods.js
	app/views/shop/shopinfos/goods_details.html.erb
	app/views/shop/shopinfos/my_goods.html.erb
	app/views/shop/shopinfos/register.html.erb
	app/views/shop/shopinfos/show_goods.html.erb
	app/views/shop/visitors/login.html.erb
	app/views/shop/visitors/my_shopping_cart.erb
	app/views/shop/visitors/order_clearing.html.erb
	app/views/shop/visitors/register.html.erb
	app/views/shop/visitors/user_order.html.erb
	config/routes.rb
	db/migrate/20141206091100_create_shops.rb
	db/migrate/201412081010300_create_shops_goods.rb
	db/migrate/20141210090000_create_visitors.rb