actualizacion...
Merge branch 'master' of https://github.com/gesveen/ProyectoBD

Conflicts:
	control/__init__.py
	gui/componentes_administrador.py