Merge origin/master

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

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

Conflicts:
	DisPaper/src/Controlador/jControlador.java