Merge branch 'master' of github.com:GDG-Nantes/devFestSite-2013
MAJ suite au push de Ju