12 files changed, 21 insertions, 21 deletions
diff --git a/forum/conf/email.py b/forum/conf/email.py
index 0144f35e..2245cdce 100644
--- a/forum/conf/email.py
+++ b/forum/conf/email.py
@@ -2,8 +2,8 @@
 Email related settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue, BooleanValue
-from livesettings import StringValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue, BooleanValue
+from forum.deps.livesettings import StringValue
 from django.utils.translation import ugettext as _
 from forum import const
 
diff --git a/forum/conf/external_keys.py b/forum/conf/external_keys.py
index f43e1120..60111fdb 100644
--- a/forum/conf/external_keys.py
+++ b/forum/conf/external_keys.py
@@ -2,7 +2,7 @@
 External service key settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue
 from django.utils.translation import ugettext as _
 from django.conf import settings as django_settings
 
diff --git a/forum/conf/flatpages.py b/forum/conf/flatpages.py
index eb6b646a..14398431 100644
--- a/forum/conf/flatpages.py
+++ b/forum/conf/flatpages.py
@@ -2,7 +2,7 @@
 Q&A forum flatpages (about, etc.)
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, LongStringValue
+from forum.deps.livesettings import ConfigurationGroup, LongStringValue
 from django.utils.translation import ugettext as _
 
 FLATPAGES = ConfigurationGroup(
diff --git a/forum/conf/forum_data_rules.py b/forum/conf/forum_data_rules.py
index e452ea7b..f9c4afda 100644
--- a/forum/conf/forum_data_rules.py
+++ b/forum/conf/forum_data_rules.py
@@ -2,8 +2,8 @@
 Settings for forum data display and entry
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, BooleanValue, IntegerValue
-from livesettings import StringValue
+from forum.deps.livesettings import ConfigurationGroup, BooleanValue, IntegerValue
+from forum.deps.livesettings import StringValue
 from django.utils.translation import ugettext as _
 from forum import const
 
@@ -39,7 +39,7 @@ settings.register(
     )
 )
 
-#todo: looks like there is a bug in livesettings 
+#todo: looks like there is a bug in forum.deps.livesettings 
 #that does not allow Integer values with defaults and choices
 settings.register(
     StringValue(
diff --git a/forum/conf/minimum_reputation.py b/forum/conf/minimum_reputation.py
index a83d94fd..ecb7f4ad 100644
--- a/forum/conf/minimum_reputation.py
+++ b/forum/conf/minimum_reputation.py
@@ -3,7 +3,7 @@ Settings for minimum reputation required for
 a variety of actions on the askbot forum
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 MIN_REP = ConfigurationGroup(
diff --git a/forum/conf/reputation_changes.py b/forum/conf/reputation_changes.py
index cef177f5..2f0bca65 100644
--- a/forum/conf/reputation_changes.py
+++ b/forum/conf/reputation_changes.py
@@ -4,7 +4,7 @@ user in response to various actions by the same
 users or others
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 REP_CHANGES = ConfigurationGroup(
diff --git a/forum/conf/settings_wrapper.py b/forum/conf/settings_wrapper.py
index b3645333..305c0fd3 100644
--- a/forum/conf/settings_wrapper.py
+++ b/forum/conf/settings_wrapper.py
@@ -1,5 +1,5 @@
 """
-Definition of a Singleton wrapper class for livesettings
+Definition of a Singleton wrapper class for forum.deps.livesettings
 with interface similar to django.conf.settings
 that is each setting has unique key and is accessible
 via dotted lookup.
@@ -11,16 +11,16 @@ from forum.conf import settings as forum_settings
 forum_settings.BLAH
 
 NOTE that at the moment there is distinction between settings
-(django settings) and forum_settings (livesettings)
+(django settings) and forum_settings (forum.deps.livesettings)
 
-the value will be taken from livesettings database or cache
+the value will be taken from forum.deps.livesettings database or cache
 note that during compilation phase database is not accessible
 for the most part, so actual values are reliably available only 
 at run time
 
-livesettings is a module developed for satchmo project
+forum.deps.livesettings is a module developed for satchmo project
 """
-from livesettings import SortedDotDict, config_register
+from forum.deps.livesettings import SortedDotDict, config_register
 
 class ConfigSettings(object):
     """A very simple Singleton wrapper for settings
@@ -41,13 +41,13 @@ class ConfigSettings(object):
         """value lookup returns the actual value of setting
         not the object - this way only very minimal modifications
         will be required in code to convert an app
-        depending on django.conf.settings to livesettings
+        depending on django.conf.settings to forum.deps.livesettings
         """
         return getattr(self.__instance, key).value
 
     def register(self, value):
         """registers the setting
-        value must be a subclass of livesettings.Value
+        value must be a subclass of forum.deps.livesettings.Value
         """
         key = value.key
         group_key = value.group.key
diff --git a/forum/conf/site_settings.py b/forum/conf/site_settings.py
index 05d0c1c8..a4f864b8 100644
--- a/forum/conf/site_settings.py
+++ b/forum/conf/site_settings.py
@@ -3,7 +3,7 @@ Q&A website settings - title, desctiption, basic urls
 keywords
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue
 from django.utils.translation import ugettext as _
 from django.utils.html import escape
 from forum import const
diff --git a/forum/conf/skin_counter_settings.py b/forum/conf/skin_counter_settings.py
index 5a9d177f..e5998433 100644
--- a/forum/conf/skin_counter_settings.py
+++ b/forum/conf/skin_counter_settings.py
@@ -2,7 +2,7 @@
 Skin settings to color view, vote and answer counters
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue, StringValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue, StringValue
 from django.utils.translation import ugettext as _
 from forum.deps.grapefruit import Color
 
diff --git a/forum/conf/skin_general_settings.py b/forum/conf/skin_general_settings.py
index 748510e7..3c74a593 100644
--- a/forum/conf/skin_general_settings.py
+++ b/forum/conf/skin_general_settings.py
@@ -2,7 +2,7 @@
 General skin settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue, IntegerValue
 from django.utils.translation import ugettext as _
 from forum.skins.utils import get_skin_choices
 
diff --git a/forum/conf/user_settings.py b/forum/conf/user_settings.py
index 760f921f..a1c09d65 100644
--- a/forum/conf/user_settings.py
+++ b/forum/conf/user_settings.py
@@ -2,7 +2,7 @@
 User policy settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, BooleanValue, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, BooleanValue, IntegerValue
 from django.utils.translation import ugettext as _
 
 USER_SETTINGS = ConfigurationGroup(
diff --git a/forum/conf/vote_rules.py b/forum/conf/vote_rules.py
index f249ef53..04332bb7 100644
--- a/forum/conf/vote_rules.py
+++ b/forum/conf/vote_rules.py
@@ -5,7 +5,7 @@ and offensive flags.
 For example number of times a person can vote each day, etc.
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 VOTE_RULES = ConfigurationGroup(