Merge origin/master

Conflicts:
	src/Modelado/VentanaPrincipal.java
Ventana Principal OK