fonction position_aleatoire
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_events
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_fighters
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_list
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_players
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/logs/error.log
Merge branch 'master' of https://github.com/camillev/Coat-of-Arms

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_events
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_fighters
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_list
	app/tmp/cache/models/myapp_cake_model_default_arenaweb_players
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr
	app/tmp/cache/persistent/myapp_cake_core_default_fr
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache