ble
Merge branch 'master' of https://github.com/imatec/buscaruca

Conflicts:
	app/tmp/cache/cake_toolbar_cached6370190b9b75bad9f1b55715ac2661b
	app/tmp/cache/models/myapp_cake_model_default_buscaruca_list
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_en-us
	app/tmp/cache/persistent/myapp_cake_core_default_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
ble
bla
from gp