diff --git a/bda/templates/bda-participants.html b/bda/templates/bda-participants.html
index 3efeccc3..289d1761 100644
--- a/bda/templates/bda-participants.html
+++ b/bda/templates/bda-participants.html
@@ -47,11 +47,8 @@
 {% for participant in participants %}{{participant.name}} : {{participant.nb_places}} places
 {% endfor %}
       </pre>
-
-  <script type="text/javascript"
-          src="{% static "js/jquery.min.js" %}"></script>
-  <script type="text/javascript"
-          src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}"></script>
+    <script type="text/javascript"
+            src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}"></script>
     <script>
     function toggle(id) {
         var pre = document.getElementById(id) ;
diff --git a/bda/templates/bda/etat-places.html b/bda/templates/bda/etat-places.html
index 66958c56..d2875cab 100644
--- a/bda/templates/bda/etat-places.html
+++ b/bda/templates/bda/etat-places.html
@@ -43,9 +43,8 @@
       sur {{ proposed }} place{{ proposed|pluralize }} proposée{{ proposed|pluralize }}
     </span>
   <script type="text/javascript"
-          src="{% static "js/jquery.min.js" %}"></script>
-  <script type="text/javascript"
-          src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}"></script>
+          src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}">
+  </script>
   <script type="text/javascript">
     $(function(){
     $("table.etat-bda").stupidtable();
diff --git a/bda/templates/bda/inscription-tirage.html b/bda/templates/bda/inscription-tirage.html
index 2e7605e5..d56b4229 100644
--- a/bda/templates/bda/inscription-tirage.html
+++ b/bda/templates/bda/inscription-tirage.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 
 {% block extra_head %}
-<script src="{% static 'js/jquery.min.js'%}" type="text/javascript"></script>
 <script src="{% static 'js/jquery-ui.min.js' %}" type="text/javascript"></script>
 <script src="{% static "js/jquery.ui.touch-punch.min.js" %}" type="text/javascript"></script>
 <link type="text/css" rel="stylesheet" href="{% static "css/jquery-ui.min.css" %}" />
@@ -93,12 +92,6 @@ var django = {
 </script>
 
             <h2 class="no-bottom-margin">Inscription au tirage au sort du  BdA</h2>
-            {% if success %}
-            <p class="success table-top">Votre inscription a été mise à jour avec succès !</p>
-            {% endif %}
-            {% if stateerror %}
-            <p class="error table-top">Impossible d'enregistrer vos modifications: vous avez apporté d'autres modifications entre temps</p>
-            {% endif %}
             <form class="form-horizontal" id="bda_form" method="post" action="{% url 'bda-tirage-inscription' tirage.id %}">
                 {% csrf_token %}
                 {% include "bda/inscription-formset.html" %}
@@ -115,7 +108,7 @@ var django = {
                         <input type="submit" class="btn btn-primary" value="Enregistrer" />
                     </div>
                     <p class="footnotes">
-                        <sup>1</sup>: cette liste de v&oelig;u est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque v&oelig;u.<br />
+                        <sup>1</sup>: cette liste de v&oelig;ux est ordonnée (du plus important au moins important), pour ajuster la priorité vous pouvez déplacer chaque v&oelig;u.<br />
                     </p>
                 </div>
             </form>
diff --git a/bda/templates/liste-reventes.html b/bda/templates/bda/liste-reventes.html
similarity index 72%
rename from bda/templates/liste-reventes.html
rename to bda/templates/bda/liste-reventes.html
index c0bf8ff0..fcf57345 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/bda/liste-reventes.html
@@ -3,15 +3,6 @@
 
 {% block realcontent %}
   <h2>Inscriptions pour BdA-Revente</h2>
-  {% if success %}
-    <p class="success">Ton inscription a bien été prise en compte !</p>
-  {% endif %}
-  {% if deja_revente %}
-    <p class="success">Des reventes existent déjà pour certains de ces spectacles ; vérifie les places disponibles sans tirage !</p>
-  {% elif inscrit_revente %}
-    <p class="success">Tu as été inscrit à une revente en cours pour ce spectacle !</p>
-  {% endif %}
-    
   <form action="" class="form-horizontal" method="post">
     {% csrf_token %}
     <div class="form-group">
diff --git a/bda/templates/bda/resume-inscription-tirage.html b/bda/templates/bda/resume-inscription-tirage.html
index 2e0531ca..0ad7ec0e 100644
--- a/bda/templates/bda/resume-inscription-tirage.html
+++ b/bda/templates/bda/resume-inscription-tirage.html
@@ -1,8 +1,6 @@
 {% extends "base_title.html" %}
 
 {% block realcontent %}
-    <h1><strong>{{ error_title }}</strong></h1>
-    <p>{{ error_description }}</p>
     {% if choices %}
     <h3>Vos v&oelig;ux:</h3>
     <ol>
diff --git a/bda/templates/resume_places.html b/bda/templates/bda/resume_places.html
similarity index 83%
rename from bda/templates/resume_places.html
rename to bda/templates/bda/resume_places.html
index 1449473a..226e697a 100644
--- a/bda/templates/resume_places.html
+++ b/bda/templates/bda/resume_places.html
@@ -2,9 +2,6 @@
 
 {% block realcontent %}
     <h2><strong>Places attribuées</strong></h3>
-    {% if warning %}
-    <h3 class="error">Attention, vous avez reçu plusieurs places pour des spectacles différents à la même date !</h3>
-    {% endif %}
     {% if places %}
     <table class="table table-striped">
         {% for place in places %}
diff --git a/bda/templates/spectacle_list.html b/bda/templates/spectacle_list.html
index 8d54aab9..d6714335 100644
--- a/bda/templates/spectacle_list.html
+++ b/bda/templates/spectacle_list.html
@@ -32,10 +32,9 @@
                     {% endfor %}
         </tbody>
         </table>
-    <script type="text/javascript"
-            src="{% static "js/jquery.min.js" %}"></script>
-    <script type="text/javascript"
-            src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}"></script>
+	<script type="text/javascript"
+	        src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}">
+        </script>
     <script type="text/javascript">
         $(function(){
         $("table.etat-bda").stupidtable();
diff --git a/bda/views.py b/bda/views.py
index 110343bc..b9ff0ac7 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -10,6 +10,7 @@ from custommail.shortcuts import (
 
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
+from django.contrib import messages
 from django.db import models, transaction
 from django.core import serializers
 from django.db.models import Count, Q, Sum
@@ -17,7 +18,7 @@ from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.conf import settings
-from django.utils import timezone
+from django.utils import timezone, formats
 from django.views.generic.list import ListView
 
 from cof.decorators import cof_required, buro_required
@@ -111,33 +112,50 @@ def places(request, tirage_id):
                 warning = True
             else:
                 dates.append(date)
-    return render(request, "resume_places.html",
+    # On prévient l'utilisateur s'il a deux places à la même date
+    if warning:
+        messages.warning(request, "Attention, vous avez reçu des places pour "
+                                  "des spectacles différents à la même date.")
+    return render(request, "bda/resume_places.html",
                   {"participant": participant,
                    "places": filtered_places,
                    "tirage": tirage,
-                   "total": total,
-                   "warning": warning})
+                   "total": total})
 
 
 @cof_required
 def inscription(request, tirage_id):
+    """
+    Vue d'inscription à un tirage BdA.
+    - On vérifie qu'on se situe bien entre la date d'ouverture et la date de
+      fermeture des inscriptions.
+    - On vérifie que l'inscription n'a pas été modifiée entre le moment où le
+      client demande le formulaire et le moment où il soumet son inscription
+      (autre session par exemple).
+    """
     tirage = get_object_or_404(Tirage, id=tirage_id)
     if timezone.now() < tirage.ouverture:
-        error_desc = tirage.ouverture.strftime('Ouverture le %d %b %Y à %H:%M')
-        return render(request, 'bda/resume-inscription-tirage.html',
-                      {"error_title": "Le tirage n'est pas encore ouvert !",
-                       "error_description": error_desc})
+        # Le tirage n'est pas encore ouvert.
+        opening = formats.localize(
+            timezone.template_localtime(tirage.ouverture))
+        messages.error(request, "Le tirage n'est pas encore ouvert : "
+                                "ouverture le {:s}".format(opening))
+        return render(request, 'bda/resume-inscription-tirage.html', {})
     if timezone.now() > tirage.fermeture:
+        # Le tirage est fermé.
         participant, created = Participant.objects.get_or_create(
             user=request.user, tirage=tirage)
         choices = participant.choixspectacle_set.order_by("priority").all()
+        messages.error(request,
+                       " C'est fini : tirage au sort dans la journée !")
         return render(request, "bda/resume-inscription-tirage.html",
-                      {"error_title": "C'est fini !",
-                       "error_description":
-                           "Tirage au sort dans la journée !",
-                       "choices": choices})
+                      {"choices": choices})
 
     def formfield_callback(f, **kwargs):
+        """
+        Fonction utilisée par inlineformset_factory ci dessous.
+        Restreint les spectacles proposés aux spectacles du bo tirage.
+        """
         if f.name == "spectacle":
             kwargs['queryset'] = tirage.spectacle_set
         return f.formfield(**kwargs)
@@ -170,13 +188,19 @@ def inscription(request, tirage_id):
         total_price += choice.spectacle.price
         if choice.double:
             total_price += choice.spectacle.price
+    # Messages
+    if success:
+        messages.success(request, "Votre inscription a été mise à jour avec "
+                                  "succès !")
+    if stateerror:
+        messages.error(request, "Impossible d'enregistrer vos modifications "
+                                ": vous avez apporté d'autres modifications "
+                                "entre temps.")
     return render(request, "bda/inscription-tirage.html",
                   {"formset": formset,
-                   "success": success,
                    "total_price": total_price,
                    "dbstate": dbstate,
-                   'tirage': tirage,
-                   "stateerror": stateerror})
+                   'tirage': tirage})
 
 
 def do_tirage(tirage_elt, token):
@@ -415,7 +439,7 @@ def list_revente(request, tirage_id):
         user=request.user, tirage=tirage)
     deja_revente = False
     success = False
-    inscrit_revente = False
+    inscrit_revente = []
     if request.method == 'POST':
         form = InscriptionReventeForm(tirage, request.POST)
         if form.is_valid():
@@ -442,17 +466,29 @@ def list_revente(request, tirage_id):
                     if min_resell is not None:
                         min_resell.answered_mail.add(participant)
                         min_resell.save()
-                        inscrit_revente = True
+                        inscrit_revente.append(spectacle)
             success = True
     else:
         form = InscriptionReventeForm(
             tirage,
-            initial={'spectacles': participant.choicesrevente.all()})
+            initial={'spectacles': participant.choicesrevente.all()}
+        )
+    # Messages
+    if success:
+        messages.success(request, "Ton inscription a bien été prise en compte")
+    if deja_revente:
+        messages.info(request, "Des reventes existent déjà pour certains de "
+                               "ces spectacles, vérifie les places "
+                               "disponibles sans tirage !")
+    if inscrit_revente:
+        shows = map("<li>{!s}</li>".format, inscrit_revente)
+        msg = (
+            "Tu as été inscrit à des reventes en cours pour les spectacles "
+            "<ul>{:s}</ul>".format('\n'.join(shows))
+        )
+        messages.info(request, msg, extra_tags="safe")
 
-    return render(request, "liste-reventes.html",
-                  {"form": form,
-                   "deja_revente": deja_revente, "success": success,
-                   "inscrit_revente": inscrit_revente})
+    return render(request, "bda/liste-reventes.html", {"form": form})
 
 
 @login_required
@@ -488,7 +524,7 @@ def buy_revente(request, spectacle_id):
             'vendeur': revente.seller.user
         }
         send_custom_mail(
-            'bda-buy-shotgun', 
+            'bda-buy-shotgun',
             'bda@ens.fr',
             [revente.seller.user.email],
             context=context,
diff --git a/cof/petits_cours_views.py b/cof/petits_cours_views.py
index 92f70706..8aae6b46 100644
--- a/cof/petits_cours_views.py
+++ b/cof/petits_cours_views.py
@@ -11,6 +11,7 @@ from django.views.generic import ListView, DetailView
 from django.views.decorators.csrf import csrf_exempt
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.contrib import messages
 
 from .models import CofProfile
 from .petits_cours_models import (
@@ -102,7 +103,9 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
             'style="width:99%; height: 90px;">'
             '</textarea>'
     })
-    return render(request, "gestioncof/traitement_demande_petit_cours.html",
+    for error in errors:
+        messages.error(request, error)
+    return render(request, "cof/traitement_demande_petit_cours.html",
                   {"demande": demande,
                    "unsatisfied": unsatisfied,
                    "proposals": proposals,
@@ -111,7 +114,6 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
                    "mainmail": mainmail,
                    "attribdata": json.dumps(attribdata),
                    "redo": redo,
-                   "errors": errors,
                    })
 
 
@@ -280,7 +282,7 @@ def _traitement_post(request, demande):
     demande.processed = datetime.now()
     demande.save()
     return render(request,
-                  "gestioncof/traitement_demande_petit_cours_success.html",
+                  "cof/traitement_demande_petit_cours_success.html",
                   {"demande": demande,
                    "redo": redo,
                    })
diff --git a/cof/static/css/cof.css b/cof/static/css/cof.css
index 9b888c4f..269736d0 100644
--- a/cof/static/css/cof.css
+++ b/cof/static/css/cof.css
@@ -520,22 +520,6 @@ h4.block-title {
  list-style: none;
 }
 
-.success {
- font-weight: bold;
- color: #7AB85F;
- background-color: transparent;
-}
-
-.success a {
- color: inherit;
-}
-
-.error {
- font-weight: bold;
- color: #F6BEBE;
- background-color: transparent;
-}
-
 #main form ul.errorlist li {
  font-weight: bold;
  color: #B00000;
@@ -1092,4 +1076,46 @@ tr.awesome{
 .petitcours-raw {
     padding:20px;
     background:#fff;
+
+}
+
+/* Messages */
+
+.messages .alert .close {
+    top:0;
+    right:0;
+}
+
+.messages .alert {
+    padding:10px 15px;
+    margin:0;
+    border:0;
+    border-radius:0;
+}
+
+div.messages div.alert-info {
+    background-color: #659C94;
+}
+
+div.messages div.alert-success {
+    background-color: #41C342;
+}
+
+div.messages div.alert-warning {
+    background-color: #efa50f;
+}
+
+div.messages div.alert-error {
+    background-color: #e14b4b;
+}
+
+div.messages div.alert-info div.container,
+div.messages div.alert-error div.container,
+div.messages div.alert-warning div.container,
+div.messages div.alert-success div.container {
+    color: white;
+}
+
+div.messages div.alert div.container a {
+    color: inherit;
 }
diff --git a/cof/templates/base.html b/cof/templates/base.html
index 2a718951..31ef4695 100644
--- a/cof/templates/base.html
+++ b/cof/templates/base.html
@@ -4,12 +4,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="fr">
     <head>
         <title>{{ site.name }}</title>
-        <link type="text/css" rel="stylesheet" href="{% static "css/bootstrap.min.css" %}" />
-        <link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" />
-        <link href="https://fonts.googleapis.com/css?family=Dosis|Dosis:700|Raleway|Roboto:300,300i,700" rel="stylesheet"> 
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
+
+	{# CSS #}
+        <link type="text/css" rel="stylesheet" href="{% static "css/bootstrap.min.css" %}" />
+        <link type="text/css" rel="stylesheet" href="{% static "css/cof.css" %}" />
+        <link href="https://fonts.googleapis.com/css?family=Dosis|Dosis:700|Raleway|Roboto:300,300i,700" rel="stylesheet"> 
+
+	{# JS #}
+        <script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
         {% block extra_head %}{% endblock %}
     </head>
     <body>
diff --git a/cof/templates/base_title.html b/cof/templates/base_title.html
index c52f29bb..935648ce 100644
--- a/cof/templates/base_title.html
+++ b/cof/templates/base_title.html
@@ -1,4 +1,4 @@
-{% extends "base_header.html" %}
+{% extends "cof/base_header.html" %}
 
 {% block interm_content %}
 <div class="container hidden-xs espace"></div>
diff --git a/cof/templates/base_header.html b/cof/templates/cof/base_header.html
similarity index 100%
rename from cof/templates/base_header.html
rename to cof/templates/cof/base_header.html
diff --git a/cof/templates/cof/calendar_subscription.html b/cof/templates/cof/calendar_subscription.html
index fca35ad8..92d6df2c 100644
--- a/cof/templates/cof/calendar_subscription.html
+++ b/cof/templates/cof/calendar_subscription.html
@@ -5,14 +5,6 @@
 
 <h2>Calendrier dynamique</h2>
 
-{% if success %}
-<p class="success">Calendrier mis à jour avec succès</p>
-{% endif %}
-
-{% if error %}
-<p class="error">{{ error }}</p>
-{% endif %}
-
 <p>Ce formulaire vous permet de définir un calendrier dynamique compatible avec
 n'importe quel logiciel ou application d'agenda. Vous pouvez choisir de
 souscrire aux événements du COF et/ou aux spectacles BdA.
diff --git a/cof/templates/event.html b/cof/templates/cof/event.html
similarity index 100%
rename from cof/templates/event.html
rename to cof/templates/cof/event.html
diff --git a/cof/templates/registration_post.html b/cof/templates/cof/registration_post.html
similarity index 100%
rename from cof/templates/registration_post.html
rename to cof/templates/cof/registration_post.html
diff --git a/cof/templates/survey.html b/cof/templates/cof/survey.html
similarity index 100%
rename from cof/templates/survey.html
rename to cof/templates/cof/survey.html
diff --git a/cof/templates/cof/traitement_demande_petit_cours_autre_niveau.html b/cof/templates/cof/traitement_demande_petit_cours_autre_niveau.html
index f92be513..c2c7e734 100644
--- a/cof/templates/cof/traitement_demande_petit_cours_autre_niveau.html
+++ b/cof/templates/cof/traitement_demande_petit_cours_autre_niveau.html
@@ -16,7 +16,6 @@
         </ul>
     </div>
     {% endif %}
-    <script src="{% static "js/jquery.min.js" %}" type="text/javascript"></script>
     {% if proposals %}
     <form method="post">
     {% csrf_token %}
diff --git a/cof/templates/home.html b/cof/templates/home.html
index 0d0edf63..6291c68c 100644
--- a/cof/templates/home.html
+++ b/cof/templates/home.html
@@ -1,4 +1,4 @@
-{% extends "base_header.html" %}
+{% extends "cof/base_header.html" %}
 
 {% block homelink %}
 {% endblock %}
diff --git a/cof/templates/inscription-petit-cours.html b/cof/templates/inscription-petit-cours.html
index 11b92aed..4ac0a874 100644
--- a/cof/templates/inscription-petit-cours.html
+++ b/cof/templates/inscription-petit-cours.html
@@ -2,7 +2,6 @@
 {% load staticfiles %}
 
 {% block extra_head %}
-<script src="{% static "js/jquery.min.js" %}" type="text/javascript"></script>
 <script src="{% static "js/jquery-ui.min.js" %}" type="text/javascript"></script>
 <script src="{% static "js/jquery.ui.touch-punch.min.js" %}" type="text/javascript"></script>
 <link type="text/css" rel="stylesheet" href="{% static "css/jquery-ui.min.css" %}" />
diff --git a/cof/templates/registration.html b/cof/templates/registration.html
index eb9bfd99..559226b7 100644
--- a/cof/templates/registration.html
+++ b/cof/templates/registration.html
@@ -4,7 +4,6 @@
 {% block page_size %}col-sm-8{% endblock %}
 
 {% block extra_head %}
-		<script src="{% static "js/jquery.min.js" %}" type="text/javascript"></script>
 		<script src="{% static "autocomplete_light/autocomplete.js" %}" type="text/javascript"></script>
 {% endblock %}
 
diff --git a/cof/views.py b/cof/views.py
index 93425ab3..e8567c58 100644
--- a/cof/views.py
+++ b/cof/views.py
@@ -12,6 +12,7 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.utils import timezone
+from django.contrib import messages
 import django.utils.six as six
 
 from .models import Survey, SurveyAnswer, SurveyQuestion, \
@@ -107,10 +108,21 @@ def survey(request, survey_id):
         except SurveyAnswer.DoesNotExist:
             current_answer = None
             form = SurveyForm(survey=survey)
-    return render(request, "survey.html", {"survey": survey, "form": form,
-                                           "success": success,
-                                           "deleted": deleted,
-                                           "current_answer": current_answer})
+    # Messages
+    if success:
+        if deleted:
+            messages.success(request,
+                             "Votre réponse a bien été supprimée")
+        else:
+            messages.success(request,
+                             "Votre réponse a bien été enregistrée ! Vous "
+                             "pouvez cependant la modifier jusqu'à la fin "
+                             "du sondage.")
+    return render(request, "cof/survey.html", {
+        "survey": survey,
+        "form": form,
+        "current_answer": current_answer
+    })
 
 
 def get_event_form_choices(event, form):
@@ -170,8 +182,13 @@ def event(request, event_id):
                              current_choices=current_registration.options)
         except EventRegistration.DoesNotExist:
             form = EventForm(event=event)
-    return render(request, "event.html",
-                  {"event": event, "form": form, "success": success})
+    # Messages
+    if success:
+        messages.success(request, "Votre inscription a bien été enregistrée ! "
+                                  "Vous pouvez cependant la modifier jusqu'à "
+                                  "la fin des inscriptions.")
+    return render(request, "cof/event.html",
+                  {"event": event, "form": form})
 
 
 def clean_post_for_status(initial):
@@ -321,7 +338,7 @@ def registration_form2(request, login_clipper=None, username=None,
         cofprofile_form = RegistrationCofProfileForm()
         event_formset = EventFormset(events=events, prefix='events')
         clubs_form = ClubsForm()
-    return render(request, "registration_form.html",
+    return render(request, "cof/registration_form.html",
                   {"member": member, "login_clipper": login_clipper,
                    "user_form": user_form,
                    "profile_form": profile_form,
@@ -444,9 +461,17 @@ def registration(request):
                     club.membres.add(member)
                     club.save()
                 success = True
-        return render(request, "registration_post.html",
-                      {"success": success,
-                       "user_form": user_form,
+        # Messages
+        if success:
+            msg = ("L'inscription de {:s} (<tt>{:s}</tt>) a été "
+                   "enregistrée avec succès"
+                   .format(member.get_full_name(), member.email))
+            if member.profile.is_cof:
+                msg += "Il est désormais membre du COF n°{:d} !".format(
+                    member.profile.num)
+            messages.success(request, msg, extra_tags='safe')
+        return render(request, "cof/registration_post.html",
+                      {"user_form": user_form,
                        "profile_form": profile_form,
                        "cofprofile_form": cofprofile_form,
                        "member": member,
@@ -653,13 +678,15 @@ def calendar(request):
                 subscription.token = uuid.uuid4()
             subscription.save()
             form.save_m2m()
+            messages.success(request,
+                             "Calendrier mis à jour avec succès.")
             return render(request, "cof/calendar_subscription.html",
                           {'form': form,
-                           'success': True,
                            'token': str(subscription.token)})
         else:
+            messages.error(request, "Formulaire incorrect.")
             return render(request, "cof/calendar_subscription.html",
-                          {'form': form, 'error': "Formulaire incorrect"})
+                          {'form': form})
     else:
         return render(request, "cof/calendar_subscription.html",
                       {'form': CalendarForm(instance=instance),
diff --git a/gestion/management/commands/syncmails.py b/gestion/management/commands/syncmails.py
index 1d3dddb8..c69633d2 100644
--- a/gestion/management/commands/syncmails.py
+++ b/gestion/management/commands/syncmails.py
@@ -13,7 +13,7 @@ from django.contrib.contenttypes.models import ContentType
 
 class Command(BaseCommand):
     help = ("Va chercher les données mails de GestioCOF stocké au format json "
-            "dans /gestioncof/management/data/custommails.json. Le format des "
+            "dans /gestion/management/data/custommails.json. Le format des "
             "données est celui donné par la commande :"
             " `python manage.py dumpdata custommail --natural-foreign` "
             "La bonne façon de mettre à jour ce fichier est donc de le "
diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh
index 04234e2d..42ced84d 100644
--- a/provisioning/bootstrap.sh
+++ b/provisioning/bootstrap.sh
@@ -21,7 +21,7 @@ echo "mysql-server mysql-server/root_password_again password $DBPASSWD" | debcon
 apt-get install -y mysql-server
 
 mysql -uroot -p$DBPASSWD -e "CREATE DATABASE $DBNAME; GRANT ALL PRIVILEGES ON $DBNAME.* TO '$DBUSER'@'localhost' IDENTIFIED BY '$DBPASSWD'"
-mysql -uroot -p$DBPASSWD -e "CREATE DATABASE test_$DBNAME; GRANT ALL PRIVILEGES ON test_$DBNAME.* TO '$DBUSER'@'localhost'"
+mysql -uroot -p$DBPASSWD -e "GRANT ALL PRIVILEGES ON test_$DBNAME.* TO '$DBUSER'@'localhost'"
 
 # Installation et configuration d'Apache
 apt-get install -y apache2