Merge branch 'dev' into feature/telecaster

Conflicts:
	example/settings.py
	teleforma/templates/teleforma/inc/conference_list.html

diff --cc example/settings.py
index 8c01e6840011aee58df0e33ba8295ea8f9a95584,b604f974834527de59420871de5e7595010d1b69..f145c9c64618921284c4cf0f7f1c4ce502dd2b24
--- 1/example/settings.py
--- 2/example/settings.py
+++ b/example/settings.py
@@@ -144,7 -145,7 +145,8 @@@ INSTALLED_APPS = 
      'timezones',
      'jqchat',
  #    'follow',
 -    'googletools',
++     'googletools',
 +     'telecaster',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (
@@@ -183,4 -186,4 +187,8 @@@ POSTMAN_AUTO_MODERATE_AS = Tru
  
  #FILE_PROTECTION_METHOD = 'xsendfile'
  
++<<<<<<< HEAD
 +TELECASTER_CONF = '/etc/telecaster/telecaster.xml'
++=======
+ GOOGLE_ANALYTICS_MODEL = True
++>>>>>>> dev

diff --cc teleforma/templates/teleforma/inc/conference_list.html
index 518f48aec1c364abc4501f8d7e10ad1d32d69618,2a49b277edd1f7eaa36f66ae486a07cd7121c5e0..be89b91575c66d7b2df9a580887c3562e781f7fb
--- 1/teleforma/templates/teleforma/inc/conference_list.html
--- 2/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@@ -56,6 -44,6 +44,4 @@@
      </table>
  </div>
  
--
--
  {% endif %}

diff --cc teleforma/views.py
Simple merge