add filter
Merge branch 'master' of https://github.com/Peluhnya/arrowshop

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/catalogs_controller.rb
	app/controllers/parser_controller.rb
	app/models/views_product.rb
	app/searches/views_product_search.rb
	app/views/admin/characteristic_items/show.html.erb
	app/views/admin/characteristic_values/_form.html.erb
	app/views/admin/shared/views_product/_line_product.html.erb
	app/views/theme/kupistroy/catalogs/show.html.erb
	app/views/theme/kupistroy/shared/views_products/_catalog_grid_views_products.html.erb
	app/views/theme/kupistroy/views_products/_items_products.html.erb
	app/views/theme/kupistroy/views_products/show.html.erb
	config/application.rb
	config/environments/production.rb
	config/routes.rb
	public/theme/kupistroy/css/style.css