Merge branch 'release/1.0.0' into develop
fix url templatetag for Django 1.5+
Merge pull request #10 from enthought/master

Fix url templatetags for Django 1.5+
Merge branch 'master' of github.com:praekelt/django-object-tools into develop
Prepare for release
Merge branch 'release/1.0.1'