Merge branch 'Fix_asso_description' into 'master'

Let use HTML tags in asso description

See merge request federez/re2o!136

preferences/templates/preferences/display_preferences.html

@@ -190,7 +190,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         </tr>
         <tr>
 	    <th>Description de l'association</th>
-            <td>{{ assooptions.description }}</td>
+            <td colspan="3">{{ assooptions.description | safe }}</td>
         </tr>
 
     </table>

re2o/templates/re2o/about.html

@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
     <h2>{% blocktrans %}About {{AssoName}}{% endblocktrans %}</h2>
-    {{ description }}
+    {{ description | safe }}
 
     <h2>{% trans "About Re2o" %}</h2>
     <p>{% blocktrans %}