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

diff --cc telecaster/models.py
index 0941fa5f283b2369e608c4b68f9c03b46d063188,2aeb5c35ac82c9dbe30b72a0a9c72ea19e35c374..5ce79d32a3a5825d1412885338d31da582e142d6
--- 1/telecaster/models.py
--- 2/telecaster/models.py
+++ b/telecaster/models.py
@@@ -53,9 -51,10 +51,11 @@@ from django.utils.translation import ug
  
  from south.modelsinspector import add_introspection_rules
  
 -from teleforma.models import *
 +from teleforma.models import Conference
 +
  
+ from tools import *
+ 
  app_label = 'telecaster'
  spacer = '_-_'