cambios
Sincronizado
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml
	src/java/Controladora/ModificarUser.java