Merge branch 'search'

diff --cc migdal/models.py
index 3e0a8a3,9a52fe2..97fbab3
--- 1/migdal/models.py
--- 2/migdal/models.py
+++ b/migdal/models.py
@@@ -6,12 -6,13 +6,13 @@@ from django.db import model
  from django.utils.translation import get_language, ugettext_lazy as _, ugettext
  from markupfield.fields import MarkupField
  from migdal.helpers import add_translatable
 -from migdal import settings
 +from migdal import app_settings
  
  
+ 
  class Category(models.Model):
      taxonomy = models.CharField(_('taxonomy'), max_length=32,
 -                    choices=settings.TAXONOMIES)
 +                    choices=app_settings.TAXONOMIES)
  
      class Meta:
          verbose_name = _('category')