update URL function for django 1.5
Merge branch 'master' into django-1.5
we dont want to serialize the view object
Merge remote-tracking branch 'origin/master' into django-1.5
Keep template backwards compatible to Django 1.4