cambios base de datos
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 650966088fb7657093479e3c372a661329d2678b.