Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/GestionPaie.java
Merge origin/master

Conflicts:
	src/gestionpaie/Bareme.java
	src/gestionpaie/FicheFonctionnaire2FXMLController.java