20 mars
Merge branch 'master' of https://github.com/timothee-berland/mapyramide
voilà
Conflicts:
	app/View/Pages/activitePhysique.ctp
	app/View/Pages/administration.ctp
	app/View/Pages/bienfaits.ctp
	app/View/Pages/calories.ctp
	app/View/Pages/caloriesVides.ctp
	app/View/Pages/cereales.ctp
	app/View/Pages/connexion.ctp
	app/View/Pages/conseilsFruits.ctp
	app/View/Pages/contacts.ctp
	app/View/Pages/fruits.ctp
	app/View/Pages/mentionsLegales.ctp
	app/View/Pages/monAlimentation.ctp
	app/View/Pages/mon_alimentation.ctp
	app/View/Pages/produitsLaitiers.ctp
	app/View/Pages/proteines.ctp
	app/View/Pages/supertracker.ctp