Fixes db:demo
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/fra/models.yml
	lib/tasks/demo.rake