Bring in Jabber settings from json configs

Conflicts:
	lms/envs/common.py

lms/envs/aws.py

@@ -103,6 +103,7 @@ PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
 
 SITE_NAME = ENV_TOKENS['SITE_NAME']
 SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN')
+JABBER = ENV_TOKENS.get('JABBER', {})
 
 # allow for environments to specify what cookie name our login subsystem should use
 # this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can

lms/envs/common.py

@@ -756,6 +756,9 @@ TEMPLATE_VISIBLE_SETTINGS = [
     # TODO: augment me
 ]
 
+############################### CHAT ################################
+JABBER = {}
+
 ############################### THEME ################################
 def enable_theme(theme_name):
     """
@@ -786,4 +789,3 @@ def enable_theme(theme_name):
     # avoid collisions with default edX static files
     STATICFILES_DIRS.append((u'themes/%s' % theme_name,
                              theme_root / 'static'))
-