foo
Merge branch 'master' of https://github.com/XoubaSA/espectaculos-med

Conflicts:
	src/main/java/es/udc/med/espectaculos/vista/VentanaPrincipalV2.java