Viva Brasil

Vamos mudar o Brasil e o Mundo!
Merge remote-tracking branch 'origin/master'

Conflicts:
	MudaBrasil/Controllers/PropostasController.cs
	MudaBrasil/MudaBrasil.XML
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	MudaBrasil/Controllers/PropostasController.cs
	MudaBrasil/MudaBrasil.XML