Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php

index.php

@@ -142,9 +142,9 @@ else
                     </a>
                     <ul>');
 
-                    foreach($events as $event)
-                        echo('<li class="calendar-link"><a href="./event.php?id='.$event['id'].'">'.$event['titre']."</a></li>");
-                    echo('
+                foreach($events as $event)
+                    echo('<li class="calendar-link"><a href="./event.php?id='.$event['event_id'].'">'.$event['event_title']."</a></li>");
+                echo('
                     </ul>
                 </li>');
                 }