Fixes some tests
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	config/locales/fra/models.yml