Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/nbproject/private/private.xml
prin

prin
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/build/classes/View/ViewBaseAdministrador.form
Merge remote-tracking branch 'origin/master'

Conflicts:
	4.- Código/AnaIsRepo/build/classes/View/ViewBaseAdministrador.form