pre-push commentaire
add commentaire OK
Rajoutez .idea dans .gitignote
gitignore .idea/
Merge branch 'MEPPOO' into dev_autre

Conflicts:
	.idea/workspace.xml
	Inc/globals.inc.php
remove .idea