Rebased to origin; removed treechanges.

diff --cc admin.py
index 506267d,1ed5586..0744e0b
--- 1/admin.py
--- 2/admin.py
+++ b/admin.py
@@@ -7,9 -7,7 +7,9 @@@ from django.utils.translation import ug
  from django.utils.safestring import mark_safe
  from django.utils.html import escape
  from django.utils.text import truncate_words
- from models import *
+ from philo.models import *
 +from django.core.exceptions import ValidationError, ObjectDoesNotExist
 +from validators import TreeParentValidator, TreePositionValidator
  
  
  class AttributeInline(generic.GenericTabularInline):

diff --cc models.py
Simple merge