Merge origin/master

Conflicts:
	src/InterfaceGraphique/MenuPrincipal.java
Merge origin/master

Conflicts:
	src/InterfaceGraphique/MenuPrincipal.java