afgfg
Merge branch 'fer2'

Conflicts:
	microblog/app/controlador/__init__.pyc
	microblog/app/controlador/contFase.pyc
	microblog/app/controlador/contPermiso.pyc
	microblog/app/controlador/contRol.pyc
	microblog/app/controlador/contUsr.pyc
	microblog/app/forms.pyc
	microblog/app/modelo/__init__.pyc
	microblog/app/modelo/item.pyc
	microblog/app/views.pyc
	microblog/app/vista/vistaFase.pyc
	microblog/app/vista/vistaProyecto.pyc
	microblog/app/vista/vistaRol.pyc
	microblog/app/vista/vistaUsuario.pyc
	
	soluciooonado varios commit