modify part 17
Merge branch 'master' of github.com:mbaniasad/industrial_site

Conflicts:
	app/controllers/products_controller.rb
	app/models/picture.rb
	app/views/products/_form.html.haml
show picture instead of file select in product form