Merge origin/master

Conflicts:
	ProjetIfRoutard/src/vue/ProjetIfRoutard.java
Merge origin/master

Conflicts:
	ProjetIfRoutard/src/metier/service/Service.java
Ajout javadoc
Ajout javadoc
Merge origin/master

Conflicts:
	ProjetIfRoutard/src/metier/service/Service.java