Merge branch 'dev' of https://github.com/EspelhoPolitico/espelho-politico into resetar_senha

Conflicts:
	db/schema.rb