Merge branch 'master' into Branch1

Conflicts:
	microblog/app/vista/vistaFase.py
Commite en master