Merge branch 'sterling_work' of github.com:AlexZerr/bonediva

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/edit.html.erb
Merge branch 'master' of github.com:AlexZerr/bonediva into sterling_work

Conflicts:
	app/controllers/products_controller.rb
	app/views/products/edit.html.erb