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

Conflicts:
	settings.py
	settings.pyc

diff --cc settings.py
index 62623e4929675d47f710a3c57700e9bd1157372b,47d02f61ecac2d46c471100a075044998c5c269b..efcfc8e46b96f3864244fe5db081f127438cfa0b
--- 1/settings.py
--- 2/settings.py
+++ b/settings.py
@@@ -197,4 -195,6 +195,6 @@@ TELEFORMA_E_LEARNING_TYPE = 'CRFPA
  TELEFORMA_GLOBAL_TWEETER = False
  TELEFORMA_PERIOD_TWEETER = True
  
 -ROUTER_IP = '81.57.221.26'
++ROUTER_IP = '192.168.1.1'
+