Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.java
Merge origin/master
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.java
Revert "Merge origin/master"

This reverts commit 5171de158e5e3122a54329e40e39f57014593fa9.