diff --git a/greenmine/settings/common.py b/greenmine/settings/common.py
index bcdd1b63..49d621e3 100644
--- a/greenmine/settings/common.py
+++ b/greenmine/settings/common.py
@@ -63,12 +63,7 @@ CACHES = {
 }
 
 PASSWORD_HASHERS = [
-    'django.contrib.auth.hashers.BCryptPasswordHasher',
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-    'django.contrib.auth.hashers.SHA1PasswordHasher',
-    'django.contrib.auth.hashers.MD5PasswordHasher',
-    'django.contrib.auth.hashers.CryptPasswordHasher',
 ]
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
@@ -76,6 +71,8 @@ SEND_BROKEN_LINK_EMAILS = True
 IGNORABLE_404_ENDS = ('.php', '.cgi')
 IGNORABLE_404_STARTS = ('/phpmyadmin/',)
 
+ATOMIC_REQUESTS = True
+
 TIME_ZONE = 'Europe/Madrid'
 LANGUAGE_CODE = 'en'
 USE_I18N = True
@@ -170,7 +167,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     #'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.transaction.TransactionMiddleware',
+    #'django.middleware.transaction.TransactionMiddleware',
     'reversion.middleware.RevisionMiddleware',
 ]
 
diff --git a/requirements.txt b/requirements.txt
index b77bcf7f..ab96f44b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,22 +1,30 @@
-Django==1.5.1
+git+https://github.com/django/django.git@stable/1.6.x
+Fabric==1.6.0
+Flask==0.9
+Jinja2==2.6
 South==0.7.6
+Werkzeug==0.8.3
 Whoosh==2.4.1
-amqp==1.0.10
+amqp==1.0.12
 anyjson==0.3.3
-billiard==2.7.3.23
-celery==3.0.17
-django-celery==3.0.11
+billiard==2.7.3.31
+celery==3.0.21
+django-celery==3.0.17
+django-filter==0.6
 django-grappelli==2.4.4
-django-reversion==1.7
+django-guardian==1.1.0.beta
 git+git://github.com/toastdriven/django-haystack.git
 django-picklefield==0.3.0
-kombu==2.5.8
+django-reversion==1.7
+django-sampledatahelper==0.0.1
+django-tastypie==0.9.14
+djangorestframework==2.2.5
+gunicorn==17.5
+kombu==2.5.12
 mimeparse==0.1.3
-py-bcrypt==0.3
+paramiko==1.10.1
+psycopg2==2.5.1
+pycrypto==2.6
 python-dateutil==2.1
 pytz==2013b
 six==1.3.0
-djangorestframework==2.2.5
-django-filter==0.6
-psycopg2==2.4.6
-django-sampledatahelper==0.0.1