Revert "Probando CoMMIT"

This reverts commit bfc12c321f300e201a3d34e4a0bf673fbbfdcb5a.
Arreglado MenuAdmin
Merge branch 'master' of https://github.com/YaninaGaitero/JSP20octubre

Conflicts:
	nbproject/private/private.properties