Merge remote-tracking branch 'origin/kath' into kath
asdasdasd
Merge remote-tracking branch 'origin/master' into kath

Conflicts:
	agepym_maestro/archivos/configuracion.json
Merge remote-tracking branch 'origin/master' into kath

Conflicts:
	agepym_maestro/ModuloUsuarios/Usuario.py
	agepym_maestro/archivos/configuracion.json
Merge branch 'master' into kath

Conflicts:
	agepym_maestro/archivos/configuracion.json
icono agregado, foto de login borrada
asdf
asdf
ASDSD
Merge remote-tracking branch 'origin/kath' into kath
asdfadsf
Se agrego funcionalidad de administracion y se redistribulleron las
ventanas.
Merge branch 'master' into Lennin

Conflicts:
	agepym_maestro/.settings/org.eclipse.core.resources.prefs
	agepym_maestro/ModuloUsuarios/Usuario.py
	agepym_maestro/Ventanas/LoginWindow.py

Signed-off-by: lennin hernandez <lennin92@gmail.com>
Merge branch 'master' into kath

Conflicts:
	agepym_maestro/.settings/org.eclipse.core.resources.prefs
	agepym_maestro/ModuloDepto/Departamento.py
	agepym_maestro/ModuloDepto/Municipio.py
	agepym_maestro/ModuloPromotoraPagaduria/GPagadurias.py
	agepym_maestro/ModuloPromotoraPagaduria/GPromotoras.py
	agepym_maestro/ModuloPromotoraPagaduria/Pagaduria.py
	agepym_maestro/ModuloPromotoraPagaduria/Promotora.py
	agepym_maestro/ModuloUsuarios/Login.py
	agepym_maestro/ModuloUsuarios/Usuario.py
	agepym_maestro/Utils/Imagenes.py
	agepym_maestro/Ventanas/LoginWindow.py
	agepym_maestro/Ventanas/principalWindow.py
	agepym_maestro/archivos/configuracion.json
Merge remote-tracking branch 'origin/Lennin' into kath

Conflicts:
	agepym_maestro/.settings/org.eclipse.core.resources.prefs
	agepym_maestro/ModuloUsuarios/Login.py
	agepym_maestro/Principal/principal.py
	agepym_maestro/Ventanas/LoginWindow.py
asdf
asdf
asdf
asdf
asdf