Acertando mapeamento de usuário com blog.
Merging...
Merge branch 'master' of https://github.com/phouverney/blog

Conflicts:
	src/main/webapp/pages/logged.xhtml