Merge origin/master

Conflicts:
	nbproject/project.properties
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/Interface/GUI_Principal.java