Alterado o changelog
Merge branch 'issue_34' into homologacao

Conflicts:
	CHANGES.rst
Merge branch 'homologacao' of github.com:plonegovbr/brasil.gov.temas into homologacao

Conflicts:
	CHANGES.rst