correcao de conflito checkout;
Merge origin/master

Conflicts:
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_pt-br
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/logs/error.log