cambios para torque
Merge origin/master

Conflicts:
	nbproject/project.properties

The project was merge.