asso
asso
Merge branch 'master' into asso

Conflicts:
	app/View/Layouts/default.ctp
	app/tmp/cache/models/myapp_cake_model_default_speedon_associations

app/tmp/cache/models/myapp_cake_model_default_speedon_associations_donne
urs
	app/tmp/cache/models/myapp_cake_model_default_speedon_donneurs

app/tmp/cache/models/myapp_cake_model_default_speedon_donneurs_recompens
es
	app/tmp/cache/models/myapp_cake_model_default_speedon_dons
	app/tmp/cache/models/myapp_cake_model_default_speedon_list
	app/tmp/cache/models/myapp_cake_model_default_speedon_recompenses
	app/tmp/cache/models/myapp_cake_model_default_speedon_users
	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
	app/tmp/logs/error.log
rien

tmp...