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
Merge pull request #23 from stefanw/django-1.5

Keep support for Django < 1.5
Merge branch 'master' into django-1.5
Merge remote-tracking branch 'origin/django-1.5' into django-1.5
Merge branch 'master' into django-1.5
Added list view possibility to mapping.py
Added description field to extra_options
Merge commit '6d0baa4eeca5d6a14a8fcdb79c242644bce9a053'

Conflicts:
	tastypie_swagger/templates/tastypie_swagger/index.html
	tastypie_swagger/views.py
Merge branch 'extra_actions' of github.com:joshkehn/django-tastypie-swagger into joshkehn-extra_actions