cambio x
Merge branch 'master' of https://github.com/untxi/estimacao

Conflicts:
	build/classes/GUI/ventanaAsignarAdministradores.form