Separados componentes de administrador
Merge branch 'master' of https://github.com/gesveen/ProyectoBD

Conflicts:
	control/__init__.py