Merge origin/master

Conflicts:
	src/modele/jdbc/Jdbc.java
	src/vue/VueAccueil.java
	src/vue/VueMenu.java