Deploy rails atualizado e configuração de email movida
Merge branch 'master' of github.com:rafaspinola/jobsworth

Conflicts:
	config/application.rb