Merge branch 'master' of /Users/main_dev/Sites/exaprint/exafab with conflicts.
Merge remote-tracking branch 'origin/master'
Planning : Modal => ajout de dossier
Merge remote-tracking branch 'origin/master'

Conflicts:
	locale/it_IT/LC_MESSAGES/messages.mo
	locale/it_IT/LC_MESSAGES/messages.po