Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telecaster-instance into dev

Conflicts:
	.gitignore
	settings.py

diff --cc .gitignore
index 539da7411f1d5a03e01b75c76fb3a76d16fbdc2f,2ccf47054169bb71b5fa240b2b9ec3ade0052257..e314405569d35fba3337373a6f58ed52fc9274ac
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,6 @@@
- *.py[co]
++*.py[co~]
+ build/
+ dist/
 -*.pyc
+ *.~[0-9]~
+ *.swp
+ *.rst~
 -*.py~

diff --cc settings.py
index 19d025916a805c83246098805b5ee9a816f533a5,efcfc8e46b96f3864244fe5db081f127438cfa0b..c781701f6280ced445106c4be46a7301eab0c4e0
--- 1/settings.py
--- 2/settings.py
+++ b/settings.py
@@@ -197,34 -194,7 +197,28 @@@ TELECASTER_CONF = [{'type':'mp3','serve
  TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
 +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_MAX_SESSIONS = 10
 +TELEFORMA_EXAM_SCRIPT_MAX_SIZE = 26214400
 +
 +PASSWORD_HASHERS = (
 +    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
 +)
 +
 +BOX_API_TOKEN = 'D2pBaN8YqjGIfS0tKrgnMP93'
 +
 +FILE_UPLOAD_TEMP_DIR = '/mnt/data/tmp'
  
 -ROUTER_IP = '192.168.1.1'
 +SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
  
 +SOUTH_MIGRATION_MODULES = {
 +    'captcha': 'captcha.south_migrations',
 +}
 +
 +SUIT_CONFIG = {
 +    'ADMIN_NAME': 'TeleForma Admin',
 +}
  
- 
- # Name of cache backend to cache user agents. If it not specified default
- # cache alias will be used. Set to `None` to disable caching.
- #USER_AGENTS_CACHE = 'default'
- 
-