Version complète BIS

MIEUX QUE THIBAULT
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/View/Arena/sight.ctp
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map