Merge remote-tracking branch 'origin/master' into remote

diff --cc settings.py
index eb551b8f32e8cc8d6bba1363d94b67b7f15c49b1,519b479ef265acbeb3a093426dafd8582c78f137..371800cf2719c0cce8410f9c5783e46d43bda652
--- 1/settings.py
--- 2/settings.py
+++ b/settings.py
@@@ -139,10 -140,7 +140,8 @@@ INSTALLED_APPS = 
      'notes',
      'timezones',
      'jqchat',
- #    'googletools',
- #    'telecaster',
 +    'teleforma.sources',
-      
+     'telecaster',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (
@@@ -189,14 -192,41 +193,42 @@@ TELECASTER_RSYNC_LOG = '/var/log/teleca
  TELECASTER_CONF = [{'type':'mp3','server_type':'icecast',
                      'conf':'/etc/telecaster/deefuzzer/telecaster_mp3_default.xml',
                      'port':'8000'},
-                    {'type':'webm','server_type':'stream-m',
+                    {'type':'webm','server_type':'icecast',
                     'conf':'/etc/telecaster/deefuzzer/telecaster_webm_default.xml',
-                    'port':'8080'}, ]
+                    'port':'8000'}, ]
+ TELECASTER_CONF_NO_STREAMING = [{'type':'mp3','server_type':'icecast',
+                     'conf':'/etc/telecaster/deefuzzer/telecaster_mp3_default_nostreaming.xml',
+                     'port':'8000'},
+                    {'type':'webm','server_type':'icecast',
+                    'conf':'/etc/telecaster/deefuzzer/telecaster_webm_default_nostreaming.xml',
+                    'port':'8000'}, ]
  
  TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
- TELEFORMA_GLOBAL_TWEETER = True
- TELEFORMA_PERIOD_TWEETER = False
+ TELEFORMA_GLOBAL_TWEETER = False
+ TELEFORMA_PERIOD_TWEETER = True
+ 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 = '81.57.221.26'
+ BOX_API_TOKEN = 'D2pBaN8YqjGIfS0tKrgnMP93'
+ 
+ FILE_UPLOAD_TEMP_DIR = '/mnt/data/tmp'
  
 +os.environ['MPLCONFIGDIR'] = '/home/telecaster/.matplotlib'
+ #SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies"
+ 
+ SOUTH_MIGRATION_MODULES = {
+     'captcha': 'captcha.south_migrations',
+ }
+ 
+ SUIT_CONFIG = {
+     'ADMIN_NAME': 'TeleForma Admin',
+ }
+