mise en place gestion +securite
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/langs/en.ini
	inc/langs/fr.ini