Merge branch 'maquette' into 'master'

Maquette

See merge request groupe-calcul/website!22

content/js/indico_planning.js

@@ -122,7 +122,7 @@ Script to parse JSON arriving from indico "timetable" and to insert
 
     return newele;
     console.log(data);
-  }
+}