Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Elements/ultimosImoveis.ctp
	app/tmp/cache/models/myapp_cake_model_default_morarfora_bairros
	app/tmp/cache/models/myapp_cake_model_default_morarfora_faixa_preco
	app/tmp/cache/models/myapp_cake_model_default_morarfora_imovel
	app/tmp/cache/models/myapp_cake_model_default_morarfora_imovel_perfil
	app/tmp/cache/models/myapp_cake_model_default_morarfora_list
	app/tmp/cache/models/myapp_cake_model_default_morarfora_perfil

	app/tmp/cache/models/myapp_cake_model_default_morarfora_regionais_bairro
	app/tmp/cache/models/myapp_cake_model_default_morarfora_tipo_imovel
	app/tmp/cache/models/myapp_cake_model_default_morarfora_tipo_moradia
	app/tmp/cache/models/myapp_cake_model_default_morarfora_tipos_quartos
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt-br
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log