my_app....
my_app bis
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_webarena_list
	app/tmp/cache/models/myapp_cake_model_default_webarena_players
	app/tmp/cache/models/myapp_cake_model_default_webarena_tools
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr
	app/tmp/cache/persistent/myapp_cake_core_cake_fr
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache