add search
	modified:   app/controllers/products_controller.rb
	modified:   app/views/products/search.html.erb
Merge branch 'master' into vitko

Conflicts:
	app/controllers/products_controller.rb
	app/models/product.rb

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/categories_controller.rb
	modified:   app/controllers/products_controller.rb
	modified:   app/models/category.rb