last fixes (hope so..)
Merge branch 'master' of https://github.com/khcr/resj

Conflicts:
	config/locales/fr.yml