no message
Merge branch 'dev' of https://github.com/fduffeal/lfg into dev

Conflicts:
	app/translations.js
	po/fr.mo
	po/fr.po
	po/template.pot