Merge origin/master

Conflicts:
	src/Interface/GUI_Listado.java
	src/Interface/GUI_Usuario.java
Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.java