增加‘整瓶特惠’

增加搜索功能；
修改分页。
增加“系列品鉴”模块
Merge branch 'refs/heads/feature/wineplus' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
	db/schema.rb
	db/seeds.rb