Merge branch 'master' into obrazy

diff --cc apps/catalogue/models/tag.py
Simple merge

diff --cc apps/catalogue/urls.py
Simple merge

diff --cc apps/catalogue/views.py
index 27d141f,d2b79c7..2acafcf
--- 1/apps/catalogue/views.py
--- 2/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@@ -37,15 -36,14 +37,15 @@@ permanent_cache = get_cache('permanent'
  
  @vary_on_headers('X-Requested-With')
  def catalogue(request):
-     cache_key='catalogue.catalogue'
+     cache_key='catalogue.catalogue/' + get_language()
      output = permanent_cache.get(cache_key)
 +
      if output is None:
          tags = models.Tag.objects.exclude(
 -            category__in=('set', 'book')).exclude(book_count=0)
 +            category__in=('set', 'book')).exclude(book_count=0, picture_count=0)
          tags = list(tags)
          for tag in tags:
 -            tag.count = tag.book_count
 +            tag.count = tag.book_count + tag.picture_count
          categories = split_tags(tags)
          fragment_tags = categories.get('theme', [])
          collections = models.Collection.objects.all()