Cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/web/WEB-INF/classes/BD/DatosPiqueo.class
	nbproject/private/private.xml