Merge branch 'master' into search

diff --cc models/fields/__init__.py
index 9e78273,d8ed839..25af832
--- 1/models/fields.py
--- 2/models/fields/__init__.py
+++ b/models/fields/__init__.py
@@@ -1,12 -1,9 +1,13 @@@
  from django import forms
 +from django.core.exceptions import ValidationError
 +from django.core.validators import validate_slug
  from django.db import models
  from django.utils import simplejson as json
 +from django.utils.text import capfirst
 +from django.utils.translation import ugettext_lazy as _
  from philo.forms.fields import JSONFormField
  from philo.validators import TemplateValidator, json_validator
+ #from philo.models.fields.entities import *
  
  
  class TemplateField(models.TextField):