Finishes first adaptation to the new price system
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	db/seeds.rb