Simplifying the views
Merge branch 'master' of github.com:daonb/django-entities