Comentario
Merge origin/master
Comentario
Merge origin/master

Conflicts:
	src/java/Controlador/Controlador.java