imc
Merge branch 'master' of https://github.com/timothee-berland/mapyramide.fr

Conflicts:
	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_debug_kit_fr-fr
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_object_map