Alteracao de configurações ignoradas
Merge branch 'master' of https://github.com/oxenti/itur_scraping

Conflicts:
	Config/database.php
	tmp/cache/persistent/itur_cake_core_cake_dev_pt-br
	tmp/cache/persistent/itur_cake_core_file_map