tentando fazer funfa
Merge branch 'dev_thiago' of https://github.com/thiagorpp/viamundi into dev_thiago

Conflicts:
	config/environments/production.rb