.
.
.
.
.
.
.
.
.
.
.
.
Merge branch 'master' of git@github.com:jpfaria/jblog.git

Conflicts:
	src/main/java/br/com/adaptation/jblog/controlador/BlogController.java
	src/main/java/br/com/adaptation/jblog/entidade/Publicacao.java