Commit de test2 et test3
Revert "Commit de test2 et test3"

This reverts commit 1b474a4f4d53029a6b6a900c4657876834959f78.
Revert "Revert "Commit de test2 et test3""

This reverts commit 63629db34786efe2ef57a3f0326d02fd9bb2984f.
Commit d'une hotfixe test2
Commit d'une modif test3
Merge master into hotfixes
Commit d'une modif test3
Commit Merge From Master
Merge develop into features

Conflicts:
	test1.php