Merge branch 'program' of https://github.com/GDG-Nantes/devFestSite-2014 into program
petites corrections sur l'afficage