Merge branch 'hotfix-mail-field-in-user-forms' into 'dev'

Remet le field email dans UserForm et AdherentForm

See merge request federez/re2o!219

users/forms.py

@@ -220,7 +220,7 @@ class UserChangeForm(FormRevMixin, forms.ModelForm):
 
     class Meta:
         model = Adherent
-        fields = ('pseudo', 'password', 'surname')
+        fields = ('pseudo', 'password', 'surname', 'email')
 
     def __init__(self, *args, **kwargs):
         prefix = kwargs.pop('prefix', self.Meta.model.__name__)
@@ -313,6 +313,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
             'name',
             'surname',
             'pseudo',
+            'email',
             'school',
             'comment',
             'room',