Merge branch 'develop'

_data/authors.yml

+# /_data/authors.yml
+authors:
+  - name             : "CCL"
+    prefix           : "ccl"
+    avatar           : /assets/images/authors-logo/indien-petit.png
+    og_image         : /assets/images/logo-ccl-grand.png
+    banner           : /assets/images/banniere-ccl-intime.png
+    bio              : "Animer, partager, avancer, s'améliorer, s'amuser"
+    location         : "Luminy"
+    email            : "centre-culturel@luminy.org"
+    facebook         : "CCLuminy"
+    helloasso        : "centre-culturel-de-luminy"
+
+  - name             : "Jardin Universitaire"
+    prefix           : "jardin"
+    avatar           : /assets/images/authors-logo/logo-jardin.png
+    banner           : /assets/images/banniere-jardin.jpg
+    bio              : "Jardin partagé chaleureux et ouvert à tous ! "
+    location         : "Bât. D"
+    email            : "jardin@luminy.org"
+    facebook         : "jardinluminy"
+    helloasso        : "jardin-universitaire-de-luminy"
+    links:
+
+  - name             : "Com & Sea"
+    prefix           : "comnsea"
+    avatar           : /assets/images/authors-logo/logo-com.png
+    bio              : "Association d'Océanologie"
+    location         : "Hexagone"
+    email            : "comandseaass@gmail.com"
+    facebook         : "comandseaAMU"
+    helloasso        : #"jardin-universitaire-de-luminy"
+    links:
+
+  - name             : "Club de Science Luminy"
+    prefix           : "club-science"
+    avatar           : /assets/images/authors-logo/logo-club-sciences.jpeg
+    bio              : "Organisation de conférences, de cours d'histoire et de philosophie des sciences"
+    location         : "Luminy"
+    email            : "club.science.luminy@gmail.com"
+    facebook         : "Club-de-Science-Luminy-114357542612098/"

_data/extlinks.yml

+# gps
+osm-hexa: https://www.openstreetmap.org/#map=19/43.22934/5.44068
+osm-cafet: https://www.openstreetmap.org/#map=19/43.23057/5.43949
+osm-jardin: https://www.openstreetmap.org/#map=19/43.22942/5.44404
+
+# reseaux sociaux
+fb-ccl: https://www.facebook.com/CCLuminy/
+fb-jardin: https://www.facebook.com/jardinluminy/
+fb-club-science: https://www.facebook.com/Club-de-Science-Luminy-114357542612098/
+helloasso-ccl: https://www.helloasso.com/associations/centre-culturel-de-luminy
+github-ccl:  https://github.com/CCLuminy/CCL-site/
+cagette: http://app.cagette.net/group/2003
+
+# retrospective
+ciao-tympans: http://ciaotympans.com/concerts/festival-toukouleur-de-luminy
+fb-photos-toukouleur: https://www.facebook.com/search/str/toukouleur/media-social?f=AbqysUj7-kKIm3UM_fvGKHZRg6NAZ_kRJGN4GTCYVhfluTB4a8PtctSoFUnEJ8dhbgy9rKzcODUTMTNqUZ2kD0nJ7-3plYB6nsCVgjjVRYjKuRyCy32iA-DyADizbrpsr64&epa=SEE_MORE
+fb-lhomme-parle: https://www.facebook.com/search/photos/?q=L%27Homme%20Parle%20toukouleur&epa=SEARCH_BOX
+gaby-feti: https://www.facebook.com/marc.marschall.89/videos/t.100003512145494/3125057238199/?type=2&video_source=user_video_tab

_data/navigation.yml

+# mashead links
+main:
+  - title: "Le CCL"
+    url: /ccl/
+  - title: "Activités"
+    url: /activites/
+  - title: "Luminy"
+    url: /luminy/
+  - title: "Contacts"
+    url: /contacts/
+
+navs:
+  - name: "ccl"
+    nav:
+    - title: "Activités"
+      url: "/ccl/activites/"
+      children:
+        - title: "Concerts et festivals"
+          url: /ccl/activites/concerts/
+        - title: "Toukouleur"
+          url: /ccl/activites/toukouleur/
+        - title: "Les jeudis du CCL"
+          url: /ccl/activites/jeudis/
+        - title: "Campus propre"
+          url: /ccl/activites/campus-propre/
+        - title: "Club de science"
+          url: /ccl/activites/club-science/
+        - title: "Projections"
+          url: /ccl/activites/projections/
+        - title: "Ateliers et animation"
+          url: /ccl/activites/ateliers/
+        - title: "Projets"
+          url: /ccl/activites/projets/
+    - title: "L'association"
+      url: "/ccl/"
+      children:
+        - title: "Qui sommes-nous ?"
+          url: /ccl/l-asso/presentation-longue/
+        - title: "Adhérer"
+          url: /ccl/l-asso/adherer/
+        - title: "Statuts"
+          url: /ccl/l-asso/statuts/
+        - title: "Contacts"
+          url: /ccl/l-asso/contacts/
+  - name: "jardin"
+    nav:
+    - title: ""
+      url: "/jardin/"
+      children:
+        - title: "Paniers bio"
+          url: /jardin/paniers/
+        - title: "Gallerie"
+          url: /jardin/gallerie/