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