Fluxo.
Merge remote-tracking branch 'origin/develop' into fluxo

Conflicts:
	db/seeds.rb
Merge remote-tracking branch 'origin/develop' into fluxo

Conflicts:
	app/views/vagas/_form.html.erb
Merge remote-tracking branch 'origin/master' into faq_review_js
general fix
mailer
merged
Merge branch 'faq_review_js' into develop
Merge pull request #143 from Plebstagios/develop

Develop