loog
Merge branch 'asso' of https://github.com/TheNabo1/speedon into asso

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_speedon_list
	app/tmp/cache/models/myapp_cake_model_default_speedon_news
	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_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache
	app/tmp/cache/persistent/myapp_cake_core_speedon_fr-fr