Merge branch 'develop' of github.com:c-base/cbmi into develop

account/views.py

@@ -31,7 +31,10 @@ def landingpage(request):
     if 'ldap_admins' in [g.name for g in request.user.groups.all()]:
         is_admin = True
     groups = Group.objects.all()
+    try:
         admins = Group.objects.get(name="ldap_admins").user_set.all()
+    except:
+        admins = []
 
     # values = get_user_values(request.user.username, request.session['ldap_password'])
     #return render_to_response("dashboard.html", locals())

dev_env_setup.sh

@@ -7,6 +7,8 @@ cd cbmi
 source bin/activate
 git clone git@github.com:c-base/cbmi.git src
 cd src
+git submodule init
+git submodule update
 pip install -r requirements.txt
 
 cat <<EOF

requirements.txt

@@ -1,4 +1,5 @@
 Django==1.4.2
 MySQL-python==1.2.4
-    django-auth-ldap==1.1.4
+django-auth-ldap==1.1.4
 django-json-rpc==0.6.1
+django-crispy-forms==1.4.0