Merge branch 'feature/password' into feature/quiz

diff --cc app/settings.py
Simple merge

diff --cc requirements.txt
Simple merge

diff --cc teleforma/admin.py
Simple merge

diff --cc teleforma/models/core.py
index a3100b88f79073b5998f39959b06de6a110a9ab2,489238038c15eb5d4a56693a9346baff42f3009a..5b055f50ce12ac765681709b5e3d1a8a1d9e8620
--- 1/teleforma/models/core.py
--- 2/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@@ -48,11 -50,14 +50,14 @@@ from django.core.paginator import Inval
  from django.db import models
  from django.forms.fields import FileField
  from django.template.defaultfilters import slugify
- from django.urls import reverse_lazy
+ from django.urls import reverse_lazy, reverse
  from django.utils.translation import ugettext_lazy as _
 -# from quiz.models import Quiz
+ from django.db.models.signals import post_save
 +from quiz.models import Quiz
  from sorl.thumbnail import default as sorl_default
  
+ import httpx
+ 
  from ..fields import ShortTextField
  
  HAS_TELEMETA = False

diff --cc teleforma/urls.py
Simple merge

diff --cc teleforma/views/crfpa.py
Simple merge