Merge branch 'develop' of github.com:fontanagiovani/novo_portal into develop

Conflicts:
	portal/conteudo/templates/conteudo/evento.html
Merge branch 'release-0.1' into develop