Begins to add actions
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/models/product.rb
Continues to add actions