Merge branch 'pb' into dev

Conflicts:
	settings.py

diff --cc settings.py
index efcfc8e46b96f3864244fe5db081f127438cfa0b,400cbc31d4493edd37bf3e720207f083cb621f89..6c9b8767388399f542c4bf9d6b0fe1bfeb6e9e72
--- 1/settings.py
--- 2/settings.py
+++ b/settings.py
@@@ -194,7 -196,6 +196,8 @@@ TELECASTER_CONF = [{'type':'mp3','serve
  TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
+ TELEFORMA_EXAM_MAX_SESSIONS = 12
  
 +ROUTER_IP = '192.168.1.1'
 +