Merge branch 'dev' into release/1.7

diff --cc Dockerfile
Simple merge

diff --cc requirements.txt
index 2c584b27861a558e7459a46ebd3553bf34651a65,5230cd7169ab4a77d40f6ecf98f07879c9d9e7e0..00f7aed82f1d7096e010f66ff39880d12b1abd87
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -3,7 -3,13 +3,13 @@@
  setuptools
  wheel
  -e .
+ 
  # Tests
 -pytest-django==2.9
 +pytest-django==3.1.2
  pytest-cov
  factory-boy
+ 
+ #doc
+ pelican
+ pdoc
+ ghp-import