Merge branch 'dev' into release/3.x

diff --cc app/settings.py
index 444b95953bf0ff81011a4f75ea938e90674746e7,193a94d2373fb4fbee81cdbb58461bebddd1e5d0..3ac5fd736f3d8e9f2e4267fe9a5b22cc3f91c2a2
--- 1/app/settings.py
--- 2/app/settings.py
+++ b/app/settings.py
@@@ -686,6 -618,9 +687,8 @@@ DATA_UPLOAD_MAX_NUMBER_FIELDS = 1024
  
  #THUMBNAIL_FORCE_OVERWRITE = True
  
 -
+ LAST_ACTIVITY_INTERVAL_SECS = 3600
+ 
  ########################
  # EMAIL
  ########################

diff --cc teleforma/admin.py
Simple merge

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