Version stable 28 mars 2013
Merge branch 'master' of https://github.com/timothee-berland/mapyramide.fr