Merge origin/master

Conflicts:
	GSB_PPE2_EQ4/src/vue/VueAuthentification.form
	GSB_PPE2_EQ4/src/vue/VueAuthentification.java
Merge origin/master

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/vue/VueAccueil.form
	src/vue/VueAccueil.java