Merge origin/master

Conflicts:
	src/Controlador/ControladorPrincipal.java