Cria modelo de Users com Devise e associação com candidatura | Crian landing Page
Remove arquivos inutilizados
Merge pull request #6 from Bouckaert/User

Cria modelo de Users com Devise e associação com candidatura | Crian lan...
Cria modelo, controller e views de Propostas de candidatura.
Merge branch 'master' into clean

Conflicts:
	app/assets/javascripts/candidatos.js.coffee
Merge pull request #7 from Bouckaert/clean

Remove arquivos inutilizados
Traduz conteúdo dos arquivos do modelo
Traduz nome de arquivos de controladores
Traduz nomes de arquivos de views
Traduz conteúdo de controladores e routes.rb
Merge branch 'translations' of https://github.com/Bouckaert/donamaria into translations
Traduz conteúdo de arquivos de views
Merge branch 'master' into translations

Conflicts:
	app/controllers/candidatos_controller.rb
	app/controllers/candidaturas_controller.rb
	app/models/candidatura.rb
	app/models/receita.rb
	app/views/candidates/_candidature.html.erb
	app/views/candidates/import.html.erb
	app/views/candidates/index.html.erb
	app/views/candidatures/import.html.erb
	app/views/expenditures/import.html.erb
	app/views/patrimonies/import.html.erb
	app/views/revenues/import.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb
Merge pull request #8 from Bouckaert/translations

Tradução do Código para Inglês
Merge branch 'master' into Proposal

Conflicts:
	app/controllers/candidatos_controller.rb
	app/models/candidatura.rb
	app/views/candidatos/index.html.erb
	config/routes.rb
	db/schema.rb
Merge pull request #9 from Bouckaert/Proposal

Cria modelo, controller e views de Propostas de candidatura.
Merge pull request #9 from Bouckaert/Proposal

Cria modelo, controller e views de Propostas de candidatura.
Merge branch 'master' of https://github.com/Bouckaert/donamaria
Remove diretório test/
Merge branch 'master' of https://github.com/Bouckaert/donamaria