Undo merge
Retornado arquivo removido por engano
Merge branch 'master' into rodfersou_buildout

Conflicts:
	bobtemplates/plonegovbr/addon/buildout.cfg.bob