.
Merge branch 'master' of https://github.com/timothee-berland/mapyramide
That's it ?

Conflicts:
	app/tmp/cache/cake_toolbar_cacheb0ad0140b718faa51a1c5737a985786a
	app/tmp/cache/cake_toolbar_cached8438413b63e5bc6a909610907f9c4c6
	app/tmp/cache/models/myapp_cake_model_default_mapyramide_list
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_fr
	app/tmp/cache/persistent/myapp_cake_core_debug_kit_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_object_map