profil et liens connexion/deconnexion
Merge branch 'master' of https://github.com/timothee-berland/mapyramide.fr

Conflicts:
	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_cake_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