diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py
index 962cb1040c..a7353ff8a0 100644
--- a/apps/icons/sets/fat_cow.py
+++ b/apps/icons/sets/fat_cow.py
@@ -30,6 +30,7 @@ DICTIONARY = {
     KEY_DELETE: 'key_delete.png',
     KEYBOARD: 'keyboard.png',
     LIGHTNING: 'lightning.png',
+    LOCK: 'lock.png',
     MEDAL_GOLD: 'medal_gold_1.png',
     MEDAL_GOLD_ADD: 'medal_gold_add.png',
     MEDAL_GOLD_DELETE: 'medal_gold_delete.png',  
diff --git a/apps/lock_manager/icons.py b/apps/lock_manager/icons.py
new file mode 100644
index 0000000000..1b3925f380
--- /dev/null
+++ b/apps/lock_manager/icons.py
@@ -0,0 +1,7 @@
+from __future__ import absolute_import
+
+from icons.literals import LOCK
+from icons import Icon
+
+icon_lock = Icon(LOCK)
+
diff --git a/apps/lock_manager/literals.py b/apps/lock_manager/literals.py
new file mode 100644
index 0000000000..1a7fd5578b
--- /dev/null
+++ b/apps/lock_manager/literals.py
@@ -0,0 +1 @@
+DEFAULT_LOCK_TIMEOUT_VALUE = 30
diff --git a/apps/lock_manager/models.py b/apps/lock_manager/models.py
index d4cd91abee..145bf6b3f3 100644
--- a/apps/lock_manager/models.py
+++ b/apps/lock_manager/models.py
@@ -7,8 +7,8 @@ from django.db import (models, transaction, DatabaseError)
 from django.utils.translation import ugettext_lazy as _
 
 from .managers import LockManager
-from .conf.settings import DEFAULT_LOCK_TIMEOUT
-
+#from .settings import DEFAULT_LOCK_TIMEOUT
+DEFAULT_LOCK_TIMEOUT = 60
 
 class Lock(models.Model):
     creation_datetime = models.DateTimeField(verbose_name=_(u'creation datetime'))
diff --git a/apps/lock_manager/registry.py b/apps/lock_manager/registry.py
new file mode 100644
index 0000000000..f4867ac6f2
--- /dev/null
+++ b/apps/lock_manager/registry.py
@@ -0,0 +1,22 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from smart_settings import LocalScope
+
+from .literals import DEFAULT_LOCK_TIMEOUT_VALUE
+from .icons import icon_lock
+
+name = 'lock_manager'
+label = _(u'Lock manager')
+description = _(u'Handles resource locking.')
+icon = icon_lock
+dependencies = ['app_registry', 'icons', 'smart_settings']
+settings = [
+    {
+        'name': 'DEFAULT_LOCK_TIMEOUT',
+        'default': DEFAULT_LOCK_TIMEOUT_VALUE,
+        'description': _(u'Default amount of time in seconds after which a lock will be automatically released.'),
+        'scopes': [LocalScope()]
+    }
+]