привязка свойств и значений к продукту
Merge remote-tracking branch 'origin/product' into product

Conflicts:
	app/views/admin/products/_properties.erb