Treasure fixed!
-_-

Git refait des siennes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arenas/halloffame.ctp
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_cake_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_default_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache