Merge branch 'master' into k-fet

cof/urls.py

@@ -16,7 +16,8 @@ from django.contrib.auth import views as django_views
 from django_cas_ng import views as django_cas_views
 from gestioncof import views as gestioncof_views, csv_views
 from gestioncof.urls import export_patterns, petitcours_patterns, \
-    surveys_patterns, events_patterns, calendar_patterns
+    surveys_patterns, events_patterns, calendar_patterns, \
+    clubs_patterns
 
 from gestioncof.autocomplete import autocomplete
 
@@ -38,6 +39,8 @@ urlpatterns = [
     url(r'^event/', include(events_patterns)),
     # Calendrier
     url(r'^calendar/', include(calendar_patterns)),
+    # Clubs
+    url(r'^clubs/', include(clubs_patterns)),
     # Authentification
     url(r'^cof/denied$', TemplateView.as_view(template_name='cof-denied.html'),
         name="cof-denied"),