Merge origin/master

Conflicts:
	nbproject/project.properties
	src/javaapplication1/JavaApplication1.java
Merge origin/slave
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/javaapplication1/JavaApplication1.java
Hola
Merge origin/master
Hola