Merge remote-tracking branch 'origin/develop' into fluxo
Início de fluxo.
Merge remote-tracking branch 'origin/develop' into fluxo

Conflicts:
	app/controllers/vagas_controller.rb
	app/models/vaga.rb
	app/views/vagas/_table.html.erb
Merge remote-tracking branch 'origin/develop' into fluxo

Conflicts:
	app/models/aluno.rb
	config/routes.rb
Merge pull request #102 from Plebstagios/develop

Develop
Merge pull request #104 from Plebstagios/develop

Develop
Aluno pode candidatar-se a e desistir de uma vaga.
Merge pull request #106 from Plebstagios/jcalice

#80 data de vagas validate
Fluxo de candidatura de aluno quase completo.
Merge remote-tracking branch 'origin/modulos' into fluxo

Conflicts:
	config/routes.rb
Replace :rubygems in with 'https://rubygems.org'.
Alterando detalhes para fazer o webservice de usuarios funcionar.
Merge pull request #114 from vlassance/vlassance

Alterando detalhes para fazer o webservice de usuarios funcionar.
Merge remote-tracking branch 'origin/develop' into fluxo

Conflicts:
	app/controllers/vagas_controller.rb
	app/models/vaga.rb
	app/views/vagas/_table.html.erb
	config/routes.rb
Data de expiração de vagas.
merge develop
merge master