Cambios en la gui
Merge branch 'master' of https://github.com/plandevida/IS-VideoClub

Conflicts:
	Practica-IS/src/app/bsodsoftware/gameclub/java/gui/paneles/PrestamosPanel.java
	Practica-IS/src/app/bsodsoftware/gameclub/java/gui/tablas/ModeloJuego.java
	Practica-IS/src/app/bsodsoftware/gameclub/java/gui/tablas/TablaPrestamos.java
Merge branch 'master' of https://github.com/plandevida/IS-VideoClub.git

Conflicts:
	Practica-IS/src/app/bsodsoftware/gameclub/java/modelo/SistemaUsuarios.java