Merge origin/master

Conflicts:
	nbproject/project.properties
	src/javaapplication1/JavaApplication1.java
Merge pull request #1 from fjzom/slave

Slave
Merge origin/slave
Merge origin/master

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