Merge remote-tracking branch 'moussa/master'

Conflicts:
	src/javafx/dahira/DahiraController.java
	src/validation/ValidateurChaine.java
	src/validation/ValideurEmail.java
Merge remote-tracking branch 'moussa/master'
commit try to fix ousmanr merge pb