Merge branch 'master' into production
gitignore
Merge branch 'master' into production

Conflicts:
	.gitignore
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
ajustement des environnement prod et stage
Merge branch 'production'