update docker apps, add apt gpg keys

diff --git a/setup.py b/setup.py
index 7e0986c7a3685fbbe4371ca0fce9006ff62118c0..11222d33bdd5b3c9dd54904085732dcff0c53db1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ setup(
         'simplejson',
         'scipy',
         'matplotlib',
-        'django>=1.4',
+        'django<1.7',
         'django-extensions',
         'djangorestframework',
         'south',