Merge branch 'master' into flexible_attributes

diff --combined admin/base.py
index d9249e5,b7c93d7..a39756a
--- 1/admin/base.py
--- 2/admin/base.py
+++ b/admin/base.py
@@@ -1,7 -1,6 +1,7 @@@
  from django.contrib import admin
  from django.contrib.contenttypes import generic
 -from philo.models import Tag, Attribute, Relationship
 +from philo.models import Tag, Attribute
 +from philo.forms import AttributeForm
  
  
  COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
@@@ -12,20 -11,29 +12,21 @@@ class AttributeInline(generic.GenericTa
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1
 -      template = 'admin/philo/edit_inline/tabular_collapse.html'
 -      allow_add = True
 -      classes = COLLAPSE_CLASSES
 -
 -
 -class RelationshipInline(generic.GenericTabularInline):
 -      ct_field = 'entity_content_type'
 -      ct_fk_field = 'entity_object_id'
 -      model = Relationship
 -      extra = 1
 -      template = 'admin/philo/edit_inline/tabular_collapse.html'
 +      template = 'admin/philo/edit_inline/tabular_attribute.html'
        allow_add = True
        classes = COLLAPSE_CLASSES
 +      form = AttributeForm
 +      exclude = ['value_object_id']
  
  
  class EntityAdmin(admin.ModelAdmin):
 -      inlines = [AttributeInline, RelationshipInline]
 +      inlines = [AttributeInline]
        save_on_top = True
  
  
  class TagAdmin(admin.ModelAdmin):
        list_display = ('name', 'slug')
        prepopulated_fields = {"slug": ("name",)}
+       search_fields = ["name"]
  
  admin.site.register(Tag, TagAdmin)