Merge origin/master

Conflicts:
	Alpha_Project/nbproject/build-impl.xml
	Alpha_Project/nbproject/project.properties
	Alpha_Project/nbproject/project.xml
	Alpha_Project/src/java/alpha/entite/model/Reparateur.java
Merge origin/master

Conflicts:
	Alpha_Project/nbproject/build-impl.xml
	Alpha_Project/nbproject/project.properties
	Alpha_Project/nbproject/project.xml
	Alpha_Project/src/java/alpha/entite/model/Reparateur.java
Merge origin/master

Conflicts:
	Alpha_Project/nbproject/build-impl.xml
	Alpha_Project/nbproject/project.properties
	Alpha_Project/nbproject/project.xml
	Alpha_Project/src/java/alpha/entite/model/Reparateur.java
Merge origin/master

Conflicts:
	Alpha_Project/web/index.xhtml