Repairs demo and cleans code
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	app/models/sale_item.rb