bugfixing and french
Merge branch 'master' into version_4_0

Conflicts:
	config/initializers/version.rb
	config/locales/dates/dates.fr-FR.yml
	config/locales/main/fr-FR.yml