Merge branch 'dev' of git.parisson.com:git/telecaster-instance into dev

Conflicts:
	settings.py

diff --cc settings.py
index 6c9b8767388399f542c4bf9d6b0fe1bfeb6e9e72,c781701f6280ced445106c4be46a7301eab0c4e0..f18f513c2121a0887125327ce060a1cb1296621c
--- 1/settings.py
--- 2/settings.py
+++ b/settings.py
@@@ -181,7 -182,7 +182,9 @@@ EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_O
  
  POSTMAN_AUTO_MODERATE_AS = True
  
 -ROUTER_IP = '109.190.89.141'
 +ROUTER_IP = '192.168.1.1'
++# ICP
++# ROUTER_IP = '109.190.89.141'
  
  TELECASTER_MASTER_SERVER = 'e-learning.crfpa.pre-barreau.com'
  TELECASTER_RSYNC_SERVER = 'telecaster@eddy.parisson.com:archives/'
@@@ -196,8 -197,28 +199,28 @@@ TELECASTER_CONF = [{'type':'mp3','serve
  TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
 -TELEFORMA_EXAM_MAX_SESSIONS = 10
 +TELEFORMA_EXAM_MAX_SESSIONS = 12
+ TELEFORMA_EXAM_TOPIC_DEFAULT_DOC_TYPE_ID = 4
+ TELEFORMA_EXAM_SCRIPT_UPLOAD = True
+ TELEFORMA_REGISTER_DEFAULT_DOC_ID = 5506
+ TELEFORMA_PERIOD_DEFAULT_ID = 6
+ TELEFORMA_EXAM_SCRIPT_MAX_SIZE = 26214400
+ 
+ PASSWORD_HASHERS = (
+     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+ )
  
- ROUTER_IP = '192.168.1.1'
+ BOX_API_TOKEN = 'D2pBaN8YqjGIfS0tKrgnMP93'
+ 
+ FILE_UPLOAD_TEMP_DIR = '/mnt/data/tmp'
+ 
+ SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
  
+ SOUTH_MIGRATION_MODULES = {
+     'captcha': 'captcha.south_migrations',
+ }
+ 
+ SUIT_CONFIG = {
+     'ADMIN_NAME': 'TeleForma Admin',
+ }