Merge branch 'master' into forum

diff --combined edumed/settings.d/30-apps.py
index bac06a1,521839b..824b44b
--- 1/edumed/settings.d/30-apps.py
--- 2/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@@ -15,8 -15,7 +15,9 @@@ INSTALLED_APPS = 
      'haystack',
      'chunks',
      'contact',
 +    'pybb',
 +    'django_libravatar',
+     'sorl.thumbnail',
  
      'django.contrib.auth',
      'django.contrib.contenttypes',

diff --combined requirements.txt
index ea14e0b,3db2e26..c96b02c
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -19,7 -19,7 +19,7 @@@ Feedparse
  django-honeypot
  
  # Librarian
- lxml
+ lxml>=3.0
  texml
  
  # sponsors
@@@ -29,6 -29,4 +29,8 @@@ django-sponsors>=1.1,<1.
  django-haystack>=2.0,<2.1
  pysolr>=3,<4
  
- sorl-thumbnail>=11,<12
 +pybbm>=0.14,<0.15
 +django-libravatar
++
+ sorl-thumbnail>=11,<12
++