Portatil
Merge origin/master

Conflicts:
	src/main/java/jorge/perez/tfg/webapp/controlador/ParserJSON.java
	src/main/webapp/js/miScript.js

Cambios en el script