Merge branch 'master' into kath
correccion
Merge branch 'master' into kath

Conflicts:
	agepym_maestro/Utils/ConectorBD.py
correccion
Merge branch 'master' into kath

Conflicts:
	agepym_maestro/Utils/ConectorBD.py
Ultimo merge con master
Merge remote-tracking branch 'origin/kath' into kath
64656
Merge branch 'Jonna' of github.com:lennin92/AGEPYM_MAESTRO into Jonna
Merge branch 'master' into Jonna

Conflicts:
	agepym_maestro/ModuloUsuarios/Usuario.py