Finish
Merge branch 'master' of github.com:YuriKMUA/glos

Conflicts:
	app/models/product.rb
	app/views/layouts/_header.html.erb
	app/views/products/edit.html.erb
	app/views/products/new.html.erb
	app/views/shared/_new_connection.html.erb
	db/schema.rb