grand nettoyage
Merge remote-tracking branch 'origin/master'

Conflicts:
	inc/helper/connected_helper.inc