Merge origin/master

Conflicts:
	src/Controlador/jControlador.java
Merge origin/master
Merge origin/master

Conflicts:
	src/Controlador/jControlador.java
Merge origin/master

Conflicts:
	src/Controlador/jControlador.java